diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2ba86ff..4461a2b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -195,8 +195,6 @@ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 
-BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
-
 # Verified Boot
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
index cbfceeb..00ff343 100644
--- a/sepolicy/private/property_contexts
+++ b/sepolicy/private/property_contexts
@@ -1,3 +1,8 @@
+# Camera
+camera.                        u:object_r:exported_default_prop:s0
+ro.camera.                     u:object_r:exported_default_prop:s0
+sys.boot.hwc                   u:object_r:exported_default_prop:s0
+
 # Fingerprint
 sys.fp.miui.token              u:object_r:exported_system_prop:s0
 
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index ee7d928..7864363 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -2,23 +2,20 @@
 ro.vendor.aware_available               u:object_r:vendor_aware_available_prop:s0
 
 # Camera
-camera.                                 u:object_r:vendor_camera_prop:s0
 persist.camera.                         u:object_r:vendor_camera_prop:s0
 ro.boot.camera.config                   u:object_r:vendor_camera_prop:s0
-ro.camera.                              u:object_r:vendor_camera_prop:s0
 ro.vendor.camera.                       u:object_r:vendor_camera_prop:s0
 vendor.camera.aux.packageblacklist      u:object_r:vendor_camera_prop:s0
 vendor.camera.config.                   u:object_r:vendor_camera_prop:s0
 vendor.camera.sensor.                   u:object_r:vendor_camera_prop:s0
-sys.boot.hwc                            u:object_r:vendor_camera_prop:s0
 
 # Fingerprint
 persist.vendor.sys.fp.                  u:object_r:vendor_fingerprint_prop:s0
 ro.hardware.fp.                         u:object_r:vendor_fingerprint_prop:s0
-sys.fp.vendor                           u:object_r:vendor_fingerprint_prop:s0
 vendor.fps_hal.                         u:object_r:vendor_fingerprint_prop:s0
 vendor.gf.debug.                        u:object_r:vendor_fingerprint_prop:s0
 vendor.silead.fp.ext.                   u:object_r:vendor_fingerprint_prop:s0
+vendor.sys.fp.                          u:object_r:vendor_fingerprint_prop:s0
 
 # Graphics
 ro.vendor.gfx.32bit.target              u:object_r:vendor_default_prop:s0
@@ -45,4 +42,3 @@ vendor.sys.thermal.                     u:object_r:vendor_thermal_normal_prop:s0
 # Wi-Fi
 ro.vendor.ril.oem.btmac                 u:object_r:vendor_wifi_prop:s0
 ro.vendor.ril.oem.wifimac               u:object_r:vendor_wifi_prop:s0
-wifi.interface                          u:object_r:wifi_hal_prop:s0