diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1d9b9bb98..481829a99 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -119,6 +119,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 
+# Changing where ro.carrier value is instantiated for system/build.prop
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index e1b547499..862d3810b 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -74,6 +74,9 @@ PRODUCT_COPY_FILES := \
         frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
         hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.carrier=unknown
+
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
 $(call inherit-product-if-exists, external/lohit-fonts/fonts.mk)
 $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)