diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
new file mode 100644
index 0000000..bc7e188
--- /dev/null
+++ b/sepolicy/private/property_contexts
@@ -0,0 +1,5 @@
+# Camera
+camera.mot.is.coming.cts   u:object_r:exported_system_prop:s0
+
+# Motorola
+ro.mot.build.customerid    u:object_r:build_prop:s0
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 51e6ee2..062792d 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,12 +1,8 @@
-# Camera
-camera.mot.is.coming.cts   u:object_r:vendor_camera_prop:s0
-
 # Radio
 vendor.ril.                u:object_r:vendor_radio_prop:s0
 
 # Motorola
 persist.vendor.nfc.        u:object_r:vendor_mot_nfc_prop:s0
-ro.mot.build.customerid    u:object_r:exported_default_prop:s0
 ro.vendor.hw.              u:object_r:vendor_mot_hw_prop:s0
 ro.vendor.mot.gki.         u:object_r:vendor_mot_hw_prop:s0
 ro.vendor.product.device   u:object_r:vendor_mot_hw_prop:s0