diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e62035e..662b0b8 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -207,6 +207,7 @@ ENABLE_VENDOR_RIL_SERVICE := true
 
 # SELinux
 include device/qcom/sepolicy_vndr/SEPolicy.mk
+BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 PRODUCT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
 PRODUCT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
new file mode 100644
index 0000000..f691e8b
--- /dev/null
+++ b/sepolicy/private/property_contexts
@@ -0,0 +1,2 @@
+# Radio
+gsm.operator.iso-country       u:object_r:telephony_status_prop:s0 exact string
diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te
index f4d3333..1686d36 100644
--- a/sepolicy/vendor/hal_camera_default.te
+++ b/sepolicy/vendor/hal_camera_default.te
@@ -4,9 +4,6 @@ allow hal_camera_default mnt_vendor_file:dir search;
 # Allow hal_camera_default to call system_server
 binder_call(hal_camera_default, system_server)
 
-# Camera props
-get_prop(hal_camera_default, exported_radio_prop)
-
 # STM Prox Sensor
 allow hal_camera_default vendor_sysfs_laser:file rw_file_perms;
 allow hal_camera_default input_device:chr_file r_file_perms;
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index 7ab017a..4ccb24c 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -1,4 +1,4 @@
 # Motorola
-type vendor_mot_fingerprint_prop, property_type;
-type vendor_mot_hw_prop, property_type;
-type vendor_mot_touch_prop, property_type;
+vendor_internal_prop(vendor_mot_fingerprint_prop);
+vendor_internal_prop(vendor_mot_hw_prop);
+vendor_internal_prop(vendor_mot_touch_prop);
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 98c999c..dbf22ce 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -3,7 +3,6 @@ camera.mot.is.coming.cts   u:object_r:vendor_camera_prop:s0
 
 # Radio
 vendor.ril.                u:object_r:vendor_radio_prop:s0
-gsm.operator.iso-country   u:object_r:exported_radio_prop:s0
 
 # Motorola
 ro.mot.build.customerid    u:object_r:exported_default_prop:s0