diff --git a/private/file_contexts b/private/file_contexts
index 1db5210d941c44a38112c6185218e03cefea3bf0..5c0bc67c628eaedac17dc5cc5a891a11012517bc 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -44,8 +44,8 @@
 /mapping_sepolicy\.cil   u:object_r:rootfs:s0
 /nonplat_sepolicy\.cil   u:object_r:rootfs:s0
 /plat_sepolicy\.cil      u:object_r:rootfs:s0
-/plat_property_contexts  u:object_r:property_contexts:s0
-/nonplat_property_contexts  u:object_r:property_contexts:s0
+/plat_property_contexts  u:object_r:property_contexts_file:s0
+/nonplat_property_contexts  u:object_r:property_contexts_file:s0
 /seapp_contexts     u:object_r:rootfs:s0
 /nonplat_seapp_contexts     u:object_r:rootfs:s0
 /plat_seapp_contexts     u:object_r:rootfs:s0
@@ -249,11 +249,13 @@
 /system/bin/virtual_touchpad     u:object_r:virtual_touchpad_exec:s0
 /system/bin/vr_wm                u:object_r:vr_wm_exec:s0
 /system/bin/hw/android\.hidl\.allocator@1\.0-service          u:object_r:hal_allocator_default_exec:s0
+/system/etc/selinux/plat_property_contexts  u:object_r:property_contexts_file:s0
 
 #############################
 # Vendor files
 #
 /vendor(/.*)?		u:object_r:system_file:s0
+/vendor/etc/selinux/nonplat_property_contexts   u:object_r:property_contexts_file:s0
 
 #############################
 # OEM and ODM files
diff --git a/public/domain.te b/public/domain.te
index 3ed451a155e438b951b00c59ec8a016e25c8eea6..2febffb5703e26d74852a08437e586b99f41c290 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -89,7 +89,7 @@ get_prop(domain, core_property_type)
 # messages to logd.
 get_prop(domain, log_property_type)
 dontaudit domain property_type:file audit_access;
-allow domain property_contexts:file r_file_perms;
+allow domain property_contexts_file:file r_file_perms;
 
 allow domain init:key search;
 allow domain vold:key search;
diff --git a/public/file.te b/public/file.te
index 21d57446896381809e9f45b0fffcbb3058a17704..1ef7a355c5d42471ca15185317019563c1076bf3 100644
--- a/public/file.te
+++ b/public/file.te
@@ -257,7 +257,7 @@ type sap_uim_socket, file_type;
 type gps_control, file_type;
 
 # property_contexts file
-type property_contexts, file_type;
+type property_contexts_file, file_type;
 
 # Allow files to be created in their appropriate filesystems.
 allow fs_type self:filesystem associate;