diff --git a/config/common.mk b/config/common.mk
index e5ed2b1c..6a34bd80 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -220,10 +220,14 @@ PRODUCT_PACKAGES += \
 
 ifeq ($(WITH_GMS),false)
 # Storage manager
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_SYSTEM_PROPERTIES += \
     ro.storage_manager.enabled=true
 endif
 
+# Default wifi country code
+PRODUCT_SYSTEM_PROPERTIES += \
+    ro.boot.wificountrycode?=00
+
 # These packages are excluded from user builds
 PRODUCT_PACKAGES_DEBUG += \
     procmem