diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 03ba613..ee95d59 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -17,7 +17,6 @@
 BUILD_BROKEN_DUP_RULES := true
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
 BUILD_BROKEN_ENFORCE_SYSPROP_OWNER := true
-BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
 
 BOARD_VENDOR := oneplus
 
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
new file mode 100644
index 0000000..57b9ddf
--- /dev/null
+++ b/sepolicy/private/property_contexts
@@ -0,0 +1,2 @@
+persist.nfc.                              u:object_r:vendor_nfc_prop:s0
+ro.gfx.driver.1                           u:object_r:graphics_config_prop:s0
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 94b4e3d..3e8b219 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,4 +1,3 @@
-persist.nfc.                              u:object_r:vendor_nfc_prop:s0
 persist.vendor.bluetooth.a2dp.            u:object_r:vendor_bluetooth_prop:s0
 persist.vendor.bluetooth.bt.uart.log      u:object_r:vendor_oem_bluetooth_prop:s0
 persist.vendor.cwb.debug                  u:object_r:vendor_cwb_prop:s0
@@ -25,7 +24,6 @@ persist.vendor.tcpdump.copy               u:object_r:vendor_oem_wifi_prop:s0
 persist.vendor.tcpdump.dir                u:object_r:vendor_oem_wifi_prop:s0
 persist.vendor.tcpdump.location           u:object_r:vendor_oem_wifi_prop:s0
 persist.vendor.tcpdump.mdpermission       u:object_r:vendor_oem_wifi_prop:s0
-ro.gfx.driver.1                           u:object_r:graphics_config_prop:s0
 ro.vendor.build.display.full_id           u:object_r:vendor_rild_prop:s0
 ro.vendor.product.device.db               u:object_r:vendor_db_security_prop:s0
 ro.vendor.product.manufacturer.db         u:object_r:vendor_db_security_prop:s0