Escape '.' character

Change-Id: I3d3c1c2d0c04f8dc77037cbf47ce7b1452fe8c33
author: Michael Bestas <mikeioannina@cyanogenmod.org> 2016-12-05 13:37:01 +0200
committer: Michael Bestas <mkbestas@lineageos.org> 2018-04-21 18:55:48 +0300
commit: b98aaace30213fd48f01cc498e04ec2ca06d670d (patch)
tree: 387be77303f852509753d19a5bfb3caea5a666a6
parent: 33cb04de188e3a3f25864dfeecc0d178be420159 (diff)
download: android_device_qcom_sepolicy-b98aaace30213fd48f01cc498e04ec2ca06d670d.tar.gz
android_device_qcom_sepolicy-b98aaace30213fd48f01cc498e04ec2ca06d670d.tar.bz2
android_device_qcom_sepolicy-b98aaace30213fd48f01cc498e04ec2ca06d670d.zip
19 files changed, 792 insertions, 792 deletions
diff --git a/apq8098_latv/file_contexts b/apq8098_latv/file_contexts
index e36f848f..8f6c84e3 100644
--- a/apq8098_latv/file_contexts
+++ b/apq8098_latv/file_contexts
@@ -28,57 +28,57 @@
 # Dev block nodes
 
 # UFS Devices
-/dev/block/platform/soc/1da4000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtpsecapp                         u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtpsecapp                        u:object_r:mdtp_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/1da4000.ufshc/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 /sys/kernel/dload/emmc_dload                                                     u:object_r:sysfs_emmc_dload:s0
 
 # A/B partitions.
-/dev/block/platform/soc/1da4000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/devcfgmedia_[ab]  u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/devcfgmedia_[ab]  u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1da4000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1da4000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/sd[bc]                    u:object_r:xbl_block_device:s0
 
 ###################################
 # Dev socket nodes
@@ -99,7 +99,7 @@
 
 ##################################
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh                                u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh                              u:object_r:init-qti-fbe-sh_exec:s0
 
 ###################################
 # sysfs files
diff --git a/common/file_contexts b/common/file_contexts
index a2e0a443..48b3edfb 100644
--- a/common/file_contexts
+++ b/common/file_contexts
@@ -170,7 +170,7 @@
 /(vendor|system/vendor)/bin/init\.mdm\.sh                   u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.mdm\.crashdata\.sh        u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.qcom\.syspart_fixup\.sh   u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/hcidump.sh                      u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/hcidump\.sh                     u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/hsic\.control\.bt\.sh           u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.ath3k\.bt\.sh             u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.crda\.sh                  u:object_r:qti_init_shell_exec:s0
@@ -184,7 +184,7 @@
 /(vendor|system/vendor)/bin/init\.qcom\.wifi\.sh            u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.qti\.ims\.sh              u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/init\.qti\.can\.sh              u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/qca6234-service.sh              u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/qca6234-service\.sh             u:object_r:qti_init_shell_exec:s0
 /(vendor|system/vendor)/bin/mm-pp-daemon        u:object_r:mm-pp-daemon_exec:s0
 /(vendor|system/vendor)/bin/mm-pp-dpps          u:object_r:mm-pp-daemon_exec:s0
 /(vendor|system/vendor)/bin/mmi                 u:object_r:mmi_exec:s0
@@ -200,8 +200,8 @@
 /(vendor|system/vendor)/bin/netmgrd             u:object_r:netmgrd_exec:s0
 /(vendor|system/vendor)/bin/qmuxd               u:object_r:qmuxd_exec:s0
 /(vendor|system/vendor)/bin/port-bridge         u:object_r:port-bridge_exec:s0
-/(vendor|system/vendor)/bin/sensors.qcom        u:object_r:sensors_exec:s0
-/(vendor|system/vendor)/bin/sensors.qti         u:object_r:sensors_exec:s0
+/(vendor|system/vendor)/bin/sensors\.qcom       u:object_r:sensors_exec:s0
+/(vendor|system/vendor)/bin/sensors\.qti        u:object_r:sensors_exec:s0
 /(vendor|system/vendor)/bin/test_diag           u:object_r:diag_exec:s0
 /(vendor|system/vendor)/bin/thermal-engine      u:object_r:thermal-engine_exec:s0
 /(vendor|system/vendor)/bin/vm_bms                              u:object_r:vm_bms_exec:s0
@@ -299,7 +299,7 @@
 /(vendor|system/vendor)/bin/wigignpt            u:object_r:wigignpt_exec:s0
 /(vendor|system/vendor)/bin/mdtpd               u:object_r:mdtpdaemon_exec:s0
 /(vendor|system/vendor)/bin/wifi_ftmd           u:object_r:wifi_ftmd_exec:s0
-/(vendor|system/vendor)/bin/fingerprint.qcom    u:object_r:fps_hal_exec:s0
+/(vendor|system/vendor)/bin/fingerprint\.qcom   u:object_r:fps_hal_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@3\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti u:object_r:hal_gatekeeper_qti_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.nxp\.hardware\.nfc@1\.0-service     u:object_r:hal_nfc_default_exec:s0
@@ -324,24 +324,24 @@
 /sys/class/thermal(/.*)?                                            u:object_r:sysfs_thermal:s0
 /sys/class/sensors(/.*)?                                            u:object_r:sysfs_sensors:s0
 /sys/class/uio(/.*)?                                                u:object_r:sysfs_uio:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,rmtfs_sharedmem/uio/uio[0-9]+(/.*)?        u:object_r:sysfs_uio_file:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,rmtfs_sharedmem/uio/uio[0-9]+/maps/map[0-9]+(/.*)?    u:object_r:sysfs_uio_file:s0
-/sys/devices(/platform)?/soc.0/[a-z0-9]+.qcom,rmtfs_sharedmem/uio/uio[0-9]+(/.*)?        u:object_r:sysfs_uio_file:s0
-/sys/devices(/platform)?/soc.0/[a-z0-9]+.qcom,rmtfs_sharedmem/uio/uio[0-9]+/maps/map[0-9]+(/.*)?    u:object_r:sysfs_uio_file:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,rmtfs_sharedmem/uio/uio[0-9]+(/.*)?       u:object_r:sysfs_uio_file:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,rmtfs_sharedmem/uio/uio[0-9]+/maps/map[0-9]+(/.*)?   u:object_r:sysfs_uio_file:s0
+/sys/devices(/platform)?/soc\.0/[a-z0-9]+\.qcom,rmtfs_sharedmem/uio/uio[0-9]+(/.*)?       u:object_r:sysfs_uio_file:s0
+/sys/devices(/platform)?/soc\.0/[a-z0-9]+\.qcom,rmtfs_sharedmem/uio/uio[0-9]+/maps/map[0-9]+(/.*)?   u:object_r:sysfs_uio_file:s0
 /sys/devices/[^/]+bcl[^/]+(/.*)?                                    u:object_r:sysfs_thermal:s0
-/sys/devices/f9200000.*/power_supply/usb(/.*)?                      u:object_r:sysfs_usb_supply:s0
+/sys/devices/f9200000\.*/power_supply/usb(/.*)?                     u:object_r:sysfs_usb_supply:s0
 /sys/devices/msm_dwc3/power_supply/usb(/.*)?                        u:object_r:sysfs_usb_supply:s0
 /sys/devices/msm_otg/power_supply/usb(/.*)?                         u:object_r:sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb[0-9]+/power_supply/usb(/.*)?        u:object_r:sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb[0-9]+/power_supply/pc_port(/.*)?    u:object_r:sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.i2c/i2c-[0-9]+/[0-9]+-[a-z0-9]+/[a-z0-9]+.i2c:qcom,[a-z0-9]+@[a-z0-9]:qcom,smb[0-9]+-charger@[0-9]+/power_supply/parallel(/.*)?    u:object_r:sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,usb-pdphy@[0-9]+/usbpd/usbpd[0-9](/.*)?    u:object_r:sysfs_usbpd_device:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb[0-9]+/power_supply/usb(/.*)?        u:object_r:sysfs_usb_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb[0-9]+/power_supply/pc_port(/.*)?    u:object_r:sysfs_usb_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.i2c/i2c-[0-9]+/[0-9]+-[a-z0-9]+/[a-z0-9]+\.i2c:qcom,[a-z0-9]+@[a-z0-9]:qcom,smb[0-9]+-charger@[0-9]+/power_supply/parallel(/.*)?    u:object_r:sysfs_usb_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,usb-pdphy@[0-9]+/usbpd/usbpd[0-9](/.*)?      u:object_r:sysfs_usbpd_device:s0
 /sys/devices/platform/battery_current_limit                         u:object_r:sysfs_thermal:s0
-/sys/devices/qpnp-charger.*/power_supply/battery(/.*)?              u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb[0-9]+/power_supply/battery(/.*)?    u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smbcharger/power_supply/battery(/.*)?    u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,fg/power_supply/bms(/.*)?               u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,qg/power_supply/bms(/.*)?               u:object_r:sysfs_battery_supply:s0
+/sys/devices/qpnp-charger\.*/power_supply/battery(/.*)?             u:object_r:sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb[0-9]+/power_supply/battery(/.*)?    u:object_r:sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smbcharger/power_supply/battery(/.*)?   u:object_r:sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,fg/power_supply/bms(/.*)?               u:object_r:sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,qg/power_supply/bms(/.*)?               u:object_r:sysfs_battery_supply:s0
 /sys/class/qcom-battery(/.*)?              u:object_r:sysfs_battery_supply:s0
 /sys/class/charge_pump(/.*)?              u:object_r:sysfs_battery_supply:s0
 /sys/devices(/platform)?/soc/qpnp-linear-charger-[a-z0-9]+/power_supply/battery(/.*)?    u:object_r:sysfs_battery_supply:s0
@@ -349,9 +349,9 @@
 /sys/devices/soc/qpnp-smbcharger-[a-z0-9]+/power_supply/battery(/.*)?        u:object_r:sysfs_battery_supply:s0
 /sys/devices/soc/qpnp-fg-[a-z0-9]+/power_supply/bms(/.*)?           u:object_r:sysfs_battery_supply:s0
 /sys/devices/soc/qpnp-smbcharger-[a-z0-9]+/power_supply/dc(/.*)?    u:object_r:sysfs_battery_supply:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/power_supply/parallel(/.*)?    u:object_r:sysfs_battery_supply:s0
-/sys/devices/soc/[a-z0-9]+.ssusb/power_supply/usb(/.*)?             u:object_r:sysfs_usb_supply:s0
-/sys/devices/soc/[a-z0-9]+.usb/power_supply/usb(/.*)?               u:object_r:sysfs_usb_supply:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/power_supply/parallel(/.*)?   u:object_r:sysfs_battery_supply:s0
+/sys/devices/soc/[a-z0-9]+\.ssusb/power_supply/usb(/.*)?            u:object_r:sysfs_usb_supply:s0
+/sys/devices/soc/[a-z0-9]+\.usb/power_supply/usb(/.*)?              u:object_r:sysfs_usb_supply:s0
 /sys/devices/soc/qpnp-vadc-[0-9]+(/.*)?                             u:object_r:sysfs_vadc_dev:s0
 /sys/bus/spmi/devices(/.*)?                                         u:object_r:sysfs_spmi_dev:s0
 /sys/kernel/irq_helper/irq_blacklist_on                             u:object_r:sysfs_irqbalance:s0
@@ -371,7 +371,7 @@
 /sys/module/msm_serial_hs/parameters/debug_mask                     u:object_r:sysfs_msmuart_file:s0
 /sys/module/msm_thermal(/.*)?                                       u:object_r:sysfs_thermal:s0
 /sys/module/msm_thermal/core_control/cpus_offlined                  u:object_r:sysfs_mpdecision:s0
-/sys/devices/f9a55000.*/power_supply/usb(/.*)?                      u:object_r:sysfs_usb_supply:s0
+/sys/devices/f9a55000\.*/power_supply/usb(/.*)?                     u:object_r:sysfs_usb_supply:s0
 /sys/devices/virtual/graphics/fb([0-3])+/hpd                        u:object_r:sysfs_graphics:s0
 /sys/devices/virtual/graphics/fb([0-3])+/res_info                   u:object_r:sysfs_graphics:s0
 /sys/devices/virtual/graphics/fb([0-3])+/s3d_mode                   u:object_r:sysfs_graphics:s0
@@ -411,10 +411,10 @@
 /sys/devices/virtual/graphics/fb([0-3])+/msm_fb_persist_mode        u:object_r:sysfs_graphics:s0
 /sys/devices/virtual/rotator/mdss_rotator/caps                      u:object_r:sysfs_graphics:s0
 
-/sys/devices/platform/vfb.([0-3])+/graphics/fb([0-3])+/modes          u:object_r:sysfs_graphics:s0
+/sys/devices/platform/vfb\.([0-3])+/graphics/fb([0-3])+/mode          u:object_r:sysfs_graphics:s0
 /sys/module/drm/parameters/vblankoffdelay                             u:object_r:sysfs_graphics:s0
-/sys/devices/platform/soc/[a-z0-9]+.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/modes u:object_r:sysfs_graphics:s0
-/sys/devices/platform/soc/[a-z0-9]+.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/status u:object_r:sysfs_graphics:s0
+/sys/devices/platform/soc/[a-z0-9]+\.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/modes u:object_r:sysfs_graphics:s0
+/sys/devices/platform/soc/[a-z0-9]+\.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/status u:object_r:sysfs_graphics:s0
 
 /sys/devices/virtual/workqueue/kgsl-events/cpumask                  u:object_r:sysfs_kgsl:s0
 /sys/devices/virtual/workqueue/kgsl-events/nice                     u:object_r:sysfs_kgsl:s0
@@ -422,24 +422,24 @@
 /sys/devices/virtual/workqueue/kgsl-workqueue/nice                  u:object_r:sysfs_kgsl:s0
 /sys/class/graphics/fb([0-3])+/mdp/caps                             u:object_r:sysfs_graphics:s0
 /sys/class/graphics/fb([0-3])+/ad                                   u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[0-9a-z]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-z]+.qcom,spmi:qcom,pmi[0-9]+@[0-9]+:qcom,leds@[a-z0-9]+(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[0-9a-z]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-z]+.qcom,spmi:qcom,pm[0-9a-z]+@[0-9]+:qcom,leds@[a-z0-9]+(/.*)? u:object_r:sysfs_leds:s0
+/sys/devices(/platform)?/soc/[0-9a-z]+\.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-z]+\.qcom,spmi:qcom,pmi[0-9]+@[0-9]+:qcom,leds@[a-z0-9]+(/.*)? u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[0-9a-z]+\.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-z]+\.qcom,spmi:qcom,pm[0-9a-z]+@[0-9]+:qcom,leds@[a-z0-9]+(/.*)? u:object_r:sysfs_leds:s0
 
-/sys/devices/platform/soc/[a-z0-9]+.qcom,spmi/spmi-0/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,haptics@c000/leds/vibrator(/.*)?   u:object_r:sysfs_leds:s0
-/sys/devices/platform/soc/ae00000.qcom,mdss_mdp/backlight(/.*)?     u:object_r:sysfs_graphics:s0
+/sys/devices/platform/soc/[a-z0-9]+\.qcom,spmi/spmi-0/spmi0-0[0-9]/[a-z0-9]+\.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,haptics@c000/leds/vibrator(/.*)?   u:object_r:sysfs_leds:s0
+/sys/devices/platform/soc/ae00000\.qcom,mdss_mdp/backlight(/.*)?    u:object_r:sysfs_graphics:s0
 /sys/devices/virtual/switch/hdmi(/.*)?                              u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,mdss_mdp/[a-z0-9]+.qcom,mdss_mdp:qcom,mdss_fb_primary/leds/lcd-backlight(/.*)?   u:object_r:sysfs_graphics:s0
-/sys/devices/soc.0/[a-z0-9]+.qcom,mdss_mdp/qcom,mdss_fb_primary.+[a-z0-9]/leds/lcd-backlight(/.*)?   u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,mdss_mdp/caps           u:object_r:sysfs_graphics:s0
-/sys/devices/soc/[a-z0-9]+.qcom,mdss_mdp/bw_mode_bitmap             u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,mdss_mdp/bw_mode_bitmap             u:object_r:sysfs_graphics:s0
-/sys/devices/soc.0/[a-z0-9]+.qcom,mdss_mdp/bw_mode_bitmap            u:object_r:sysfs_graphics:s0
-/sys/devices/soc.0/[a-z0-9]+.qcom,mdss_mdp/caps                      u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,mdss_cam/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,mdss_rotator/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,mdss_rotator/caps       u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,vidc/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+.qcom,cci/[a-z0-9]+.qcom,cci:qcom,camera@[0-2]/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,mdss_mdp/[a-z0-9]+\.qcom,mdss_mdp:qcom,mdss_fb_primary/leds/lcd-backlight(/.*)?   u:object_r:sysfs_graphics:s0
+/sys/devices/soc\.0/[a-z0-9]+\.qcom,mdss_mdp/qcom,mdss_fb_primary\.+[a-z0-9]/leds/lcd-backlight(/.*)?   u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,mdss_mdp/caps          u:object_r:sysfs_graphics:s0
+/sys/devices/soc/[a-z0-9]+\.qcom,mdss_mdp/bw_mode_bitmap            u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,mdss_mdp/bw_mode_bitmap   u:object_r:sysfs_graphics:s0
+/sys/devices/soc\.0/[a-z0-9]+\.qcom,mdss_mdp/bw_mode_bitmap         u:object_r:sysfs_graphics:s0
+/sys/devices/soc\.0/[a-z0-9]+\.qcom,mdss_mdp/caps                   u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,mdss_cam/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,mdss_rotator/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,mdss_rotator/caps      u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,vidc/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,cci/[a-z0-9]+\.qcom,cci:qcom,camera@[0-2]/video4linux/video[0-33]/name(/.*)?   u:object_r:sysfs_graphics:s0
 /sys/bus/platform/drivers/xhci_msm_hsic(/.*)?                       u:object_r:sysfs_hsic:s0
 /sys/devices/msm_hsic_host/host_ready                               u:object_r:sysfs_hsic_host_rdy:s0
 /sys/bus/esoc(/.*)?                                                 u:object_r:sysfs_esoc:s0
@@ -470,18 +470,18 @@
 /sys/devices(/platform)?/soc/soc:qcom,llccbw/devfreq/soc:qcom,llccbw(/.*)? u:object_r:sysfs_devfreq:s0
 /sys/devices(/platform)?/soc/soc:qcom,l3-cpu[0-9]/devfreq/soc:qcom,l3-cpu[0-9](/.*)? u:object_r:sysfs_devfreq:s0
 /sys/devices(/platform)?/soc/soc:qcom,l3-cdsp/devfreq/soc:qcom,l3-cdsp(/.*)? u:object_r:sysfs_devfreq:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/clkscale_enable        u:object_r:sysfs_scsi_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.ufshc/clkscale_enable       u:object_r:sysfs_scsi_host:s0
 /sys/devices(/platform)?/soc/[a-f0-9]+/host0/scsi_host/host0(/.*)?  u:object_r:sysfs_scsi_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
-/sys/devices(/platform)?/soc(.[0-9])?/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
-/sys/devices(/platform)?/soc(.[0-9])?/[a-f0-9]+.qcom,kgsl-3d0/devfreq/[a-f0-9]+.qcom,kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
-/sys/devices(/platform)?/soc(.[0-9])?/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpuclk u:object_r:sysfs_kgsl_gpuclk:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.qcom,kgsl-3d0/kgsl/kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
+/sys/devices(/platform)?/soc(\.[0-9])?/[a-f0-9]+\.qcom,kgsl-3d0/kgsl/kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
+/sys/devices(/platform)?/soc(\.[0-9])?/[a-f0-9]+\.qcom,kgsl-3d0/devfreq/[a-f0-9]+\.qcom,kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
+/sys/devices(/platform)?/soc(\.[0-9])?/[a-f0-9]+\.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpuclk u:object_r:sysfs_kgsl_gpuclk:s0
 
-/sys/devices(/platform)?/soc(.[0-9])?/[a-f0-9]+.sdhci/mmc_host/mmc0/clk_scaling(/.*)? u:object_r:sysfs_mmc_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/bdi/read_ahead_kb u:object_r:sysfs_mmc_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/queue/read_ahead_kb u:object_r:sysfs_mmc_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/mmcblk0rpmb/bdi/read_ahead_kb u:object_r:sysfs_mmc_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/mmcblk0rpmb/queue/read_ahead_kb u:object_r:sysfs_mmc_host:s0
+/sys/devices(/platform)?/soc(\.[0-9])?/[a-f0-9]+\.sdhci/mmc_host/mmc0/clk_scaling(/.*)? u:object_r:sysfs_mmc_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/bdi/read_ahead_kb u:object_r:sysfs_mmc_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/queue/read_ahead_kb u:object_r:sysfs_mmc_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/mmcblk0rpmb/bdi/read_ahead_kb u:object_r:sysfs_mmc_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.sdhci/mmc_host/mmc[0-9]/mmc0:[0-9]+/block/mmcblk[0-9]/mmcblk0rpmb/queue/read_ahead_kb u:object_r:sysfs_mmc_host:s0
 /sys/devices/virtual/bdi/[0-9]+:[0-9]+/read_ahead_kb u:object_r:sysfs_mmc_host:s0
 /sys/devices/virtual/block/dm-[0-9]+/queue/read_ahead_kb u:object_r:sysfs_mmc_host:s0
 
@@ -684,8 +684,8 @@
 ##################################
 # SDM blobs
 #
-/(vendor|system/vendor)/lib(64)?/libsdm-disp-vndapis.so             u:object_r:same_process_hal_file:s0
-/(vendor|system/vendor)/lib(64)?/libsdmutils.so                     u:object_r:same_process_hal_file:s0
+/(vendor|system/vendor)/lib(64)?/libsdm-disp-vndapis\.so            u:object_r:same_process_hal_file:s0
+/(vendor|system/vendor)/lib(64)?/libsdmutils\.so                    u:object_r:same_process_hal_file:s0
 
 # rawdump partition
 /sys/kernel/dload/emmc_dload                                        u:object_r:sysfs_emmc_dload:s0
@@ -694,4 +694,4 @@
 ##################################
 # Crypto
 #
-/(vendor|system/vendor)/lib(64)?/libcryptfs_hw.so                   u:object_r:same_process_hal_file:s0
+/(vendor|system/vendor)/lib(64)?/libcryptfs_hw\.so                  u:object_r:same_process_hal_file:s0
diff --git a/legacy-common/file_contexts b/legacy-common/file_contexts
index 533290d0..a946247e 100644
--- a/legacy-common/file_contexts
+++ b/legacy-common/file_contexts
@@ -27,8 +27,8 @@
 /sys/devices(/platform)?/soc\.0/qpnp-vm-bms-[a-z0-9]+/power_supply/bms(/.*)?  u:object_r:sysfs_battery_supply:s0
 
 # Graphics
-/sys/devices(/platform)?/soc\.0/[a-z0-9]+.qcom,mdss_mdp/qcom,mdss_fb_primary\.[0-9]+/leds/lcd-backlight(/.*)?  u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc\.0/[a-z0-9]+.qcom,mdss_mdp/caps                  u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc\.0/[a-z0-9]+\.qcom,mdss_mdp/qcom,mdss_fb_primary\.[0-9]+/leds/lcd-backlight(/.*)?  u:object_r:sysfs_graphics:s0
+/sys/devices(/platform)?/soc\.0/[a-z0-9]+\.qcom,mdss_mdp/caps                 u:object_r:sysfs_graphics:s0
 
 # Subsys restart
 /sys/devices(/platform)?/soc\.0/[a-z0-9\.:]+,[a-z0-9\-]+/subsys[0-9]+/name    u:object_r:sysfs_ssr:s0
diff --git a/msm8909/file_contexts b/msm8909/file_contexts
index bfc630d8..0a152144 100644
--- a/msm8909/file_contexts
+++ b/msm8909/file_contexts
@@ -31,36 +31,36 @@
 ###################################
 # Primary storage device nodes
 #
-/dev/block/platform/soc.0/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/config                u:object_r:frp_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/fsg                 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/fsc                 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/modemst1            u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/modemst2            u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/ssd                 u:object_r:ssd_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/misc                u:object_r:misc_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/userdata            u:object_r:userdata_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/logdump             u:object_r:logdump_partition:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/config              u:object_r:frp_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/recovery            u:object_r:recovery_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/cache               u:object_r:cache_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/boot                u:object_r:boot_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/system              u:object_r:system_block_device:s0
 /dev/block/mmcblk0                                                    u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                u:object_r:rpmb_device:s0
 
 # for wear we are still using soc not soc.0
-/dev/block/platform/soc/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/config                u:object_r:frp_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsg                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsc                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst1             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst2             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/ssd                  u:object_r:ssd_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/misc                 u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/userdata             u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/logdump              u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/recovery             u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cache                u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/boot                 u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/system               u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/config               u:object_r:frp_block_device:s0
 
 #For adreno libs
 /(vendor|system/vendor)/lib(64)?/libsc-a3xx\.so                                     u:object_r:same_process_hal_file:s0
@@ -77,16 +77,16 @@
 ###################################
 # sysfs files
 #
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/MPU6050-accel(/.*)?            u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/MPU6050-gyro(/.*)?             u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/apds9930-light(/.*)?           u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/apds9930-proximity(/.*)?       u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/compass(/.*)?                  u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/bma2x2-accel(/.*)?             u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ltr553-light(/.*)?             u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ltr553-proximity(/.*)?         u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ap3426-light(/.*)?             u:object_r:sysfs_sensors:s0
-/sys/devices/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ap3426-proximity(/.*)?         u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/MPU6050-accel(/.*)?           u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/MPU6050-gyro(/.*)?            u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/apds9930-light(/.*)?          u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/apds9930-proximity(/.*)?      u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/compass(/.*)?                 u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/bma2x2-accel(/.*)?            u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ltr553-light(/.*)?            u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ltr553-proximity(/.*)?        u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ap3426-light(/.*)?            u:object_r:sysfs_sensors:s0
+/sys/devices/soc/[a-z0-9]+\.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/input/input[0-9]/ap3426-proximity(/.*)?        u:object_r:sysfs_sensors:s0
 /sys/devices/virtual/input/input[0-9]/akm8963-mag(/.*)?                                                  u:object_r:sysfs_sensors:s0
 /sys/kernel/boot_adsp/boot                                                                               u:object_r:sysfs_boot:s0
 ###############################################
diff --git a/msm8916/file_contexts b/msm8916/file_contexts
index c59fe8fb..6342e925 100644
--- a/msm8916/file_contexts
+++ b/msm8916/file_contexts
@@ -28,18 +28,18 @@
 ###################################
 # Primary storage device nodes
 #
-/dev/block/platform/soc.0/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/config                u:object_r:frp_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/fsg                 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/fsc                 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/modemst1            u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/modemst2            u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/ssd                 u:object_r:ssd_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/misc                u:object_r:misc_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/userdata            u:object_r:userdata_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/logdump             u:object_r:logdump_partition:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/config              u:object_r:frp_block_device:s0
 /dev/block/mmcblk0                                                    u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/boot                u:object_r:boot_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/recovery            u:object_r:recovery_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/system              u:object_r:system_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/cache               u:object_r:cache_block_device:s0
diff --git a/msm8937/file_contexts b/msm8937/file_contexts
index b8962180..f9a4dcae 100644
--- a/msm8937/file_contexts
+++ b/msm8937/file_contexts
@@ -32,26 +32,26 @@
 /dev/block/mmcblk0rpmb                                              u:object_r:rpmb_device:s0
 
 #Using soc instead of soc.0 for 3.18 kernel
-/dev/block/platform/soc/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/dip                   u:object_r:dip_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/mdtp                  u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/config                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsg                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsc                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst1             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst2             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/ssd                  u:object_r:ssd_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/misc                 u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/system               u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/userdata             u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/dip                  u:object_r:dip_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/mdtp                 u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/config               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/boot                 u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/recovery             u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cache                u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/logdump              u:object_r:logdump_partition:s0
 
 
 
 #rawdump partition
-/dev/block/platform/soc/7824900.sdhci/by-name/rawdump               u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/rawdump              u:object_r:rawdump_block_device:s0
 
 ############################################################################################
 #Same hal process libs
@@ -69,22 +69,22 @@
 ##################################
 # A/B partitions.
 #EMMC
-/dev/block/platform/soc/7824900.sdhci/by-name/aboot_[ab]            u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/boot_[ab]             u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cmnlib_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cmnlib64_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/devcfg_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/mdtp_[ab]             u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/keymaster_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modem_[ab]            u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/dsp_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/pmic_[ab]             u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/rpm_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/system_[ab]           u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/tz_[ab]               u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/ImageFv_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/vendor_[ab]           u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/sbl1_[ab]             u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/aboot_[ab]           u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/boot_[ab]            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cmnlib_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cmnlib64_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/devcfg_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/mdtp_[ab]            u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/keymaster_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modem_[ab]           u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/dsp_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/pmic_[ab]            u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/rpm_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/system_[ab]          u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/tz_[ab]              u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/ImageFv_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/vendor_[ab]          u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/sbl1_[ab]            u:object_r:xbl_block_device:s0
 
 #HAL Server
 /(vendor|system/vendor)/bin/hw/hal-server             u:object_r:hal-server_exec:s0
diff --git a/msm8952/file_contexts b/msm8952/file_contexts
index b117e27a..7ae1c0df 100644
--- a/msm8952/file_contexts
+++ b/msm8952/file_contexts
@@ -28,37 +28,37 @@
 ###################################
 # Primary storage device nodes
 #
-/dev/block/platform/soc.0/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/dip                   u:object_r:dip_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/mdtp                  u:object_r:mdtp_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/fsg                 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/fsc                 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/modemst1            u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/modemst2            u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/ssd                 u:object_r:ssd_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/misc                u:object_r:misc_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/system              u:object_r:system_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/recovery            u:object_r:recovery_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/cache               u:object_r:cache_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/boot                u:object_r:boot_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/userdata            u:object_r:userdata_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/dip                 u:object_r:dip_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/mdtp                u:object_r:mdtp_device:s0
 /dev/block/mmcblk0                                                    u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/config                u:object_r:frp_block_device:s0
-/dev/block/platform/soc.0/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/config              u:object_r:frp_block_device:s0
+/dev/block/platform/soc\.0/7824900\.sdhci/by-name/logdump             u:object_r:logdump_partition:s0
 
 #Using soc instead of soc.0 to make it compatable with 3.18 kernel
 
-/dev/block/platform/soc/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/dip                   u:object_r:dip_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/mdtp                  u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsg                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsc                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst1             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst2             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/ssd                  u:object_r:ssd_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/misc                 u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/system               u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/recovery             u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cache                u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/boot                 u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/userdata             u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/dip                  u:object_r:dip_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/mdtp                 u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/logdump              u:object_r:logdump_partition:s0
diff --git a/msm8953/file_contexts b/msm8953/file_contexts
index 80eb0d31..e2829af5 100644
--- a/msm8953/file_contexts
+++ b/msm8953/file_contexts
@@ -32,29 +32,29 @@
 /dev/block/mmcblk0rpmb                                              u:object_r:rpmb_device:s0
 
 #Using soc instead of soc.0 for 3.18 kernel
-/dev/block/platform/soc/7824900.sdhci/by-name/fsg                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/fsc                   u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst1              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modemst2              u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/misc                  u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/system                u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/dip                   u:object_r:dip_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/mdtp                  u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/config                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/logdump               u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/boot                  u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/recovery              u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cache                 u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsg                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/fsc                  u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst1             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modemst2             u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/ssd                  u:object_r:ssd_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/misc                 u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/system               u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/userdata             u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/dip                  u:object_r:dip_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/mdtp                 u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/config               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/logdump              u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/boot                 u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/recovery             u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cache                u:object_r:cache_block_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/7824900.sdhci/by-name/rawdump               u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/rawdump              u:object_r:rawdump_block_device:s0
 
 /sys/module/usb_f_mtp/parameters(/.*)?                              u:object_r:sysfs_usb_mtp_device:s0
 /sys/devices/platform/soc/200f000\.qcom,spmi/spmi-0/spmi0-02/200f000\.qcom,spmi:qcom,pmi8950@2:qcom,qpnp-smbcharger/leds/red/brightness    u:object_r:sysfs_spmi_device:s0
 /sys/devices/platform/soc/200f000\.qcom,spmi/spmi-0/spmi0-03/200f000\.qcom,spmi:qcom,pmi8950@3:qcom,haptic@c000/leds/vibrator/activate     u:object_r:sysfs_spmi_device:s0
-/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,vibrator@5700/leds/vibrator/activate      u:object_r:sysfs_spmi_device:s0
+/sys/devices/platform/soc/200f000\.qcom,spmi/spmi-0/spmi0-03/200f000\.qcom,spmi:qcom,pmi632@3:qcom,vibrator@5700/leds/vibrator/activate    u:object_r:sysfs_spmi_device:s0
 
 
 ############################################################################################
@@ -70,19 +70,19 @@
 ##################################
 # A/B partitions.
 #EMMC
-/dev/block/platform/soc/7824900.sdhci/by-name/aboot_[ab]            u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/boot_[ab]             u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cmnlib_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/cmnlib64_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/devcfg_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/mdtp_[ab]             u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/keymaster_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/modem_[ab]            u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/dsp_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/pmic_[ab]             u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/rpm_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/system_[ab]           u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/tz_[ab]               u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/ImageFv_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/vendor_[ab]           u:object_r:system_block_device:s0
-/dev/block/platform/soc/7824900.sdhci/by-name/sbl1_[ab]             u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/aboot_[ab]           u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/boot_[ab]            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cmnlib_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/cmnlib64_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/devcfg_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/mdtp_[ab]            u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/keymaster_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/modem_[ab]           u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/dsp_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/pmic_[ab]            u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/rpm_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/system_[ab]          u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/tz_[ab]              u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/ImageFv_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/vendor_[ab]          u:object_r:system_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/sbl1_[ab]            u:object_r:xbl_block_device:s0
diff --git a/msm8960/file_contexts b/msm8960/file_contexts
index e59fdad6..c95e3e54 100755
--- a/msm8960/file_contexts
+++ b/msm8960/file_contexts
@@ -10,15 +10,15 @@
 /dev/block/bootdevice/by-name/m9kefs3           u:object_r:efs_boot_dev:s0
 /dev/block/bootdevice/by-name/m9kefsc           u:object_r:efs_boot_dev:s0
 /dev/gss                                        u:object_r:gss_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/fsg      u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/ssd      u:object_r:ssd_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/boot     u:object_r:boot_block_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/recovery      u:object_r:recovery_block_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/cache    u:object_r:cache_block_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/system   u:object_r:system_block_device:s0
-/dev/block/platform/msm_sdcc.1/by-name/logdump  u:object_r:logdump_partition:s0
+/dev/block/platform/msm_sdcc\.1/by-name/fsg      u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/ssd      u:object_r:ssd_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/boot     u:object_r:boot_block_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/recovery u:object_r:recovery_block_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/cache    u:object_r:cache_block_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/system   u:object_r:system_block_device:s0
+/dev/block/platform/msm_sdcc\.1/by-name/logdump  u:object_r:logdump_partition:s0
 /dev/block/mmcblk0                              u:object_r:root_block_device:s0
 /dev/socket/mpdecision                          u:object_r:mpdecision_socket:s0
 ###################################
diff --git a/msm8976/file_contexts b/msm8976/file_contexts
index fdc22bdd..f641a844 100644
--- a/msm8976/file_contexts
+++ b/msm8976/file_contexts
@@ -26,4 +26,4 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #rawdump partition
-/dev/block/platform/soc/7824900.sdhci/by-name/rawdump               u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7824900\.sdhci/by-name/rawdump              u:object_r:rawdump_block_device:s0
diff --git a/msm8992/file_contexts b/msm8992/file_contexts
index f4957ddb..00fbce29 100644
--- a/msm8992/file_contexts
+++ b/msm8992/file_contexts
@@ -27,17 +27,17 @@
 ###################################
 # Dev block nodes
 #
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/userdata                           u:object_r:userdata_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/boot                               u:object_r:boot_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/config                             u:object_r:frp_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/logdump                            u:object_r:logdump_partition:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/fsc                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/fsg                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/modemst1                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/modemst2                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/ssd                              u:object_r:ssd_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/misc                             u:object_r:misc_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/userdata                         u:object_r:userdata_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/boot                             u:object_r:boot_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/recovery                         u:object_r:recovery_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/cache                            u:object_r:cache_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/config                           u:object_r:frp_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/logdump                          u:object_r:logdump_partition:s0
 /dev/block/mmcblk0rpmb                                                              u:object_r:rpmb_device:s0
 /dev/block/mmcblk0                                                                  u:object_r:root_block_device:s0
diff --git a/msm8994/file_contexts b/msm8994/file_contexts
index 4c073044..436b659c 100644
--- a/msm8994/file_contexts
+++ b/msm8994/file_contexts
@@ -32,30 +32,30 @@
 /dev/block/mmcblk0                                                                  u:object_r:root_block_device:s0
 
 # UFS devices
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/userdata                           u:object_r:userdata_block_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/boot                               u:object_r:boot_block_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc.0/fc594000.ufshc/by-name/logdump                            u:object_r:logdump_partition:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/fsc                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/fsg                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/modemst1                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/modemst2                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/ssd                              u:object_r:ssd_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/misc                             u:object_r:misc_block_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/userdata                         u:object_r:userdata_block_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/boot                             u:object_r:boot_block_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/recovery                         u:object_r:recovery_block_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/cache                            u:object_r:cache_block_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/frp                              u:object_r:frp_block_device:s0
+/dev/block/platform/soc\.0/fc594000\.ufshc/by-name/logdump                          u:object_r:logdump_partition:s0
 
 
 # eMMC devices
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/userdata                           u:object_r:userdata_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/boot                               u:object_r:boot_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/config                             u:object_r:frp_block_device:s0
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/logdump                            u:object_r:logdump_partition:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/fsc                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/fsg                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/modemst1                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/modemst2                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/ssd                              u:object_r:ssd_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/misc                             u:object_r:misc_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/userdata                         u:object_r:userdata_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/boot                             u:object_r:boot_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/recovery                         u:object_r:recovery_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/cache                            u:object_r:cache_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/config                           u:object_r:frp_block_device:s0
+/dev/block/platform/soc\.0/f9824900\.sdhci/by-name/logdump                          u:object_r:logdump_partition:s0
diff --git a/msm8996/file_contexts b/msm8996/file_contexts
index cff79328..b8f4f744 100644
--- a/msm8996/file_contexts
+++ b/msm8996/file_contexts
@@ -37,50 +37,50 @@
 /dev/block/mmcblk0                                                              u:object_r:root_block_device:s0
 
 # UFS devices
-/dev/block/platform/soc/624000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/system                             u:object_r:system_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/userdata                           u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/624000.ufshc/by-name/dip                                u:object_r:dip_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/boot                               u:object_r:boot_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/mdm1m9kefs1                        u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/624000.ufshc/by-name/mdm1m9kefs2                        u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/624000.ufshc/by-name/mdm1m9kefs3                        u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/624000.ufshc/by-name/mdm1m9kefsc                        u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/624000.ufshc/by-name/logdump                            u:object_r:logdump_partition:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/dip                               u:object_r:dip_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/mdm1m9kefs1                       u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/mdm1m9kefs2                       u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/mdm1m9kefs3                       u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/mdm1m9kefsc                       u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
 
 # eMMC devices
-/dev/block/platform/soc/7464900.sdhci/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/ssd                               u:object_r:ssd_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/misc                              u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/rpm                               u:object_r:rpmb_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/msadp                             u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/dip                               u:object_r:dip_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/mdtp                              u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/recovery                          u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/cache                             u:object_r:cache_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/frp                               u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/mdm1m9kefs1                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/mdm1m9kefs2                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/mdm1m9kefs3                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/mdm1m9kefsc                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/fsc                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/fsg                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/modemst1                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/modemst2                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/ssd                              u:object_r:ssd_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/misc                             u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/rpm                              u:object_r:rpmb_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/system                           u:object_r:system_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/userdata                         u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/msadp                            u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/dip                              u:object_r:dip_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/mdtp                             u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/boot                             u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/recovery                         u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/cache                            u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/frp                              u:object_r:frp_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/mdm1m9kefs1                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/mdm1m9kefs2                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/mdm1m9kefs3                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/mdm1m9kefsc                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/logdump                          u:object_r:logdump_partition:s0
 
 ###################################
 # Dev socket nodes
@@ -91,17 +91,17 @@
 #
 /(vendor|system/vendor)/bin/amfsservice                                         u:object_r:amfsservice_exec:s0
 /(vendor|system/vendor)/bin/seccamd                                             u:object_r:seccamd_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor.qti.hardware.automotive.vehicle@1.0-service          u:object_r:hal_automotive_vehicle_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.automotive\.vehicle@1\.0-service     u:object_r:hal_automotive_vehicle_qti_exec:s0
 
 ###################################
 # sysfs files
 #
 /sys/devices/virtual/graphics/fb([0-2])+/lineptr_value                          u:object_r:sysfs_graphics:s0
 
-/sys/devices/soc/b00000.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpu_available_frequencies   u:object_r:sysfs_kgsl:s0
+/sys/devices/soc/b00000\.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpu_available_frequencies  u:object_r:sysfs_kgsl:s0
 
 #rawdump partition
-/dev/block/platform/soc/7464900.sdhci/by-name/rawdump                           u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/rawdump                          u:object_r:rawdump_block_device:s0
 
 ############################################################################################
 #Same hal process libs
@@ -117,47 +117,47 @@
 ##################################
 # A/B partitions.
 #EMMC
-/dev/block/platform/soc/7464900.sdhci/by-name/aboot_[ab]            u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/boot_[ab]             u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/cmnlib_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/cmnlib64_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/devcfg_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/mdtp_[ab]             u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/hyp_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/keymaster_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/modem_[ab]            u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7464900.ufshc/by-name/bluetooth_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/dsp_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/pmic_[ab]             u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/rpm_[ab]              u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/system_[ab]           u:object_r:system_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/tz_[ab]               u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/ImageFv_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/vendor_[ab]           u:object_r:system_block_device:s0
-/dev/block/platform/soc/7464900.sdhci/by-name/xbl_[ab]              u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/aboot_[ab]           u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/boot_[ab]            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/cmnlib_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/cmnlib64_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/devcfg_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/mdtp_[ab]            u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/hyp_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/keymaster_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/modem_[ab]           u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7464900\.ufshc/by-name/bluetooth_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/dsp_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/pmic_[ab]            u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/rpm_[ab]             u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/system_[ab]          u:object_r:system_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/tz_[ab]              u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/ImageFv_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/vendor_[ab]          u:object_r:system_block_device:s0
+/dev/block/platform/soc/7464900\.sdhci/by-name/xbl_[ab]             u:object_r:xbl_block_device:s0
 
 #UFS
-/dev/block/platform/soc/624000.ufshc/by-name/aboot_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/624000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/aboot_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/624000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/624000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/624000\.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
diff --git a/msm8998/file_contexts b/msm8998/file_contexts
index 9dc95fa2..2b1cc3a4 100644
--- a/msm8998/file_contexts
+++ b/msm8998/file_contexts
@@ -28,59 +28,59 @@
 # Dev block nodes
 
 # UFS Devices
-/dev/block/platform/soc/1da4000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtpsecapp                         u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtpsecapp                        u:object_r:mdtp_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/1da4000.ufshc/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 #Same hal process libs
 /(vendor|system/vendor)/lib(64)?/hw/gralloc\.msm8998\.so        u:object_r:same_process_hal_file:s0
 /(vendor|system/vendor)/lib(64)?/hw/vulkan\.msm8998\.so         u:object_r:same_process_hal_file:s0
 
 # A/B partitions.
-/dev/block/platform/soc/1da4000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1da4000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1da4000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
 
 ##################################
 # non-hlos mount points
@@ -89,10 +89,10 @@
 
 ##################################
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh				u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh				u:object_r:init-qti-fbe-sh_exec:s0
 
 ###################################
 # sysfs files
 #
-/sys/devices/soc/75ba000.i2c/i2c-12/12-0020/input/input[0-9]/secure_touch_enable u:object_r:sysfs_securetouch:s0
+/sys/devices/soc/75ba000\.i2c/i2c-12/12-0020/input/input[0-9]/secure_touch_enable u:object_r:sysfs_securetouch:s0
 /sys/devices/virtual/graphics/fb([0-3])+/lineptr_value                          u:object_r:sysfs_graphics:s0
diff --git a/msmnile/file_contexts b/msmnile/file_contexts
index 3d14bd49..7943a81b 100644
--- a/msmnile/file_contexts
+++ b/msmnile/file_contexts
@@ -28,59 +28,59 @@
 # Dev block nodes
 
 # UFS Devices
-/dev/block/platform/soc/1d84000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip                                u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dip                               u:object_r:dip_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 # A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/aop_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vbmeta_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/qupfw_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_config_[ab]  u:object_r:custom_ab_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
 
 ##################################
 # non-hlos mount points
@@ -88,4 +88,4 @@
 /bt_firmware               u:object_r:bt_firmware_file:s0
 
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh		u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh		u:object_r:init-qti-fbe-sh_exec:s0
diff --git a/qcs605/file_contexts b/qcs605/file_contexts
index 4b5315c8..4ab2b03f 100644
--- a/qcs605/file_contexts
+++ b/qcs605/file_contexts
@@ -31,116 +31,116 @@
 /dev/block/mmcblk0rpmb                                                          u:object_r:rpmb_device:s0
 
 # UFS Devices
-/dev/block/platform/soc/1d84000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip                                u:object_r:dip_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/storsec                            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dip                               u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec                           u:object_r:boot_block_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 # A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab]   u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/storsec_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/aop_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vbmeta_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/qupfw_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_config_[ab]  u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
 
 #for eMMC
 # A/B partitions.
-/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab]   u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/aop_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/vbmeta_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/dtbo_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/qupfw_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/xbl_config_[ab]  u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/storsec_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
 
 #non A/B
-/dev/block/platform/soc/7c4000.sdhci/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dip                                u:object_r:dip_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec                            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/dip                               u:object_r:dip_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/storsec                           u:object_r:boot_block_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7c4000/.sdhci/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
 /dev/block/mmcblk0                                              u:object_r:root_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000/.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000/.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
 
 ##################################
 # non-hlos mount points
@@ -148,7 +148,7 @@
 /bt_firmware               u:object_r:bt_firmware_file:s0
 
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh		u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh		u:object_r:init-qti-fbe-sh_exec:s0
 
 ##################################
 # same process HAL libs
diff --git a/sdm660/file_contexts b/sdm660/file_contexts
index b38c436b..a1970ba5 100644
--- a/sdm660/file_contexts
+++ b/sdm660/file_contexts
@@ -27,51 +27,51 @@
 
 ###################################
 # Dev block nodes for eMMC
-/dev/block/platform/soc/c0c4000.sdhci/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/ssd                               u:object_r:ssd_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/misc                              u:object_r:misc_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/rpm                               u:object_r:rpmb_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/msadp                             u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/dip                               u:object_r:dip_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdtp                              u:object_r:mdtp_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/recovery                          u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/cache                             u:object_r:cache_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/frp                               u:object_r:frp_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdm1m9kefs1                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdm1m9kefs2                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdm1m9kefs3                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdm1m9kefsc                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/fsc                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/fsg                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/modemst1                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/modemst2                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/ssd                              u:object_r:ssd_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/misc                             u:object_r:misc_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/rpm                              u:object_r:rpmb_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/system                           u:object_r:system_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/userdata                         u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/msadp                            u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/dip                              u:object_r:dip_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdtp                             u:object_r:mdtp_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/boot                             u:object_r:boot_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/recovery                         u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/cache                            u:object_r:cache_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/frp                              u:object_r:frp_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdm1m9kefs1                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdm1m9kefs2                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdm1m9kefs3                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdm1m9kefsc                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/logdump                          u:object_r:logdump_partition:s0
 
 
 #for UFS blocks
-/dev/block/platform/soc/1da4000.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/dip                               u:object_r:dip_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdm1m9kefs1                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdm1m9kefs2                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdm1m9kefs3                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdm1m9kefsc                       u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/fsc                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/fsg                              u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modemst1                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modemst2                         u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ssd                              u:object_r:ssd_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/misc                             u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rpm                              u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/system                           u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/userdata                         u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/msadp                            u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/dip                              u:object_r:dip_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtp                             u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/boot                             u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/recovery                         u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cache                            u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/frp                              u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdm1m9kefs1                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdm1m9kefs2                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdm1m9kefs3                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdm1m9kefsc                      u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/logdump                          u:object_r:logdump_partition:s0
 
 #Primary storage device nodes
 /dev/block/mmcblk0rpmb                                                          u:object_r:rpmb_device:s0
@@ -79,7 +79,7 @@
 
 ##################################
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh				u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh				u:object_r:init-qti-fbe-sh_exec:s0
 
 ##################################
 # non-hlos mount points
@@ -89,56 +89,56 @@
 ##################################
 # A/B partitions.
 #EMMC
-/dev/block/platform/soc/c0c4000.sdhci/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
 
 #UFS
-/dev/block/platform/soc/1da4000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1da4000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1da4000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
 
 ############################################################################################
 #Same hal process libs
@@ -150,12 +150,12 @@
 # rawdump partition
 
 #EMMC
-/dev/block/platform/soc/c0c4000.sdhci/by-name/rawdump                           u:object_r:rawdump_block_device:s0
-/dev/block/platform/soc/c0c4000.sdhci/by-name/ramdump                           u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/rawdump                          u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/c0c4000\.sdhci/by-name/ramdump                          u:object_r:rawdump_block_device:s0
 
 #UFS
-/dev/block/platform/soc/1da4000.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
-/dev/block/platform/soc/1da4000.ufshc/by-name/ramdump                           u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/rawdump                          u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1da4000\.ufshc/by-name/ramdump                          u:object_r:rawdump_block_device:s0
 
 #USB
 /sys/module/usb_f_qcrndis/parameters/rndis_dl_max_xfer_size			u:object_r:sysfs_rndis_usb:s0
diff --git a/sdm670/file_contexts b/sdm670/file_contexts
index 9c12c02e..b76c52b4 100644
--- a/sdm670/file_contexts
+++ b/sdm670/file_contexts
@@ -31,116 +31,116 @@
 /dev/block/mmcblk0rpmb                                                          u:object_r:rpmb_device:s0
 
 # UFS Devices
-/dev/block/platform/soc/1d84000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip                                u:object_r:dip_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/storsec                            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dip                               u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec                           u:object_r:boot_block_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 # A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab]   u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/storsec_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/aop_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vbmeta_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/qupfw_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_config_[ab]  u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
 
 #for eMMC
 # A/B partitions.
-/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab]   u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/aop_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/vbmeta_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/dtbo_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/qupfw_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/xbl_config_[ab]  u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/storsec_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
 
 #non A/B
-/dev/block/platform/soc/7c4000.sdhci/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dip                                u:object_r:dip_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec                            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/dip                               u:object_r:dip_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/storsec                           u:object_r:boot_block_device:s0
 
 #rawdump partition
-/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7c4000\.sdhci/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 # Block device holding the GPT, where the A/B attributes are stored.
 /dev/block/mmcblk0                                              u:object_r:root_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
 
 ##################################
 # non-hlos mount points
@@ -148,7 +148,7 @@
 /bt_firmware               u:object_r:bt_firmware_file:s0
 
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh		u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh		u:object_r:init-qti-fbe-sh_exec:s0
 
 ##################################
 # same process HAL libs
diff --git a/sdm845/file_contexts b/sdm845/file_contexts
index 4cceacb7..785e93b7 100644
--- a/sdm845/file_contexts
+++ b/sdm845/file_contexts
@@ -28,60 +28,60 @@
 # Dev block nodes
 
 # UFS Devices
-/dev/block/platform/soc/1d84000.ufshc/by-name/system                            u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg                                u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2                           u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd                                u:object_r:ssd_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/misc                               u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm                                u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp                              u:object_r:mba_debug_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/recovery                           u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cache                              u:object_r:cache_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/frp                                u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp                               u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip                                u:object_r:dip_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/storsec                            u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system                            u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/userdata                          u:object_r:userdata_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot                              u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/logdump                           u:object_r:logdump_partition:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsc                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsg                               u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst1                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst2                          u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd                               u:object_r:ssd_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/misc                              u:object_r:misc_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm                               u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp                             u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/recovery                          u:object_r:recovery_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cache                             u:object_r:cache_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/frp                               u:object_r:frp_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp                              u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dip                               u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec                           u:object_r:boot_block_device:s0
 #rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump                            u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rawdump                           u:object_r:rawdump_block_device:s0
 
 # A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab]         u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab]     u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab]    u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab]        u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab]    u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab]           u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab]       u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab]          u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab]       u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab]          u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab]         u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab]   u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab]        u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab]   u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/storsec_[ab]      u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ImageFv_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/abl_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/apdp_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/boot_[ab]        u:object_r:boot_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab]    u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/hyp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/keymaster_[ab]   u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab]       u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/bluetooth_[ab]   u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/pmic_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/system_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/tz_[ab]          u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor_[ab]      u:object_r:system_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_[ab]         u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/aop_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vbmeta_[ab]      u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab]        u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dsp_[ab]         u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtp_[ab]        u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/mdtpsecapp_[ab]  u:object_r:mdtp_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/qupfw_[ab]       u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_config_[ab]  u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec_[ab]     u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ImageFv_[ab]     u:object_r:custom_ab_block_device:s0
 # Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade]                   u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/sd[ade]                  u:object_r:gpt_block_device:s0
 
 # Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc]                 u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/sd[bc]                u:object_r:xbl_block_device:s0
 
 ##################################
 # non-hlos mount points
@@ -89,7 +89,7 @@
 /bt_firmware               u:object_r:bt_firmware_file:s0
 
 # FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh		u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.qseecomd\.sh		u:object_r:init-qti-fbe-sh_exec:s0
 
 # Same process file
 /(vendor|system/vendor)/lib(64)?/hw/gralloc\.sdm845\.so   u:object_r:same_process_hal_file:s0
@@ -97,4 +97,4 @@
 /(vendor|system/vendor)/bin/sscrpcd       u:object_r:sensors_exec:s0
 
 # sdm845 specific sysfs file
-/sys/devices/platform/soc/17d41000.qcom,cpucc/17d41000.qcom,cpucc:qcom,wil6210/subsys8/name    u:object_r:sysfs_ssr:s0
+/sys/devices/platform/soc/17d41000\.qcom,cpucc/17d41000\.qcom,cpucc:qcom,wil6210/subsys8/name  u:object_r:sysfs_ssr:s0
author	Michael Bestas <mikeioannina@cyanogenmod.org>	2016-12-05 13:37:01 +0200
committer	Michael Bestas <mkbestas@lineageos.org>	2018-04-21 18:55:48 +0300
commit	b98aaace30213fd48f01cc498e04ec2ca06d670d (patch)
tree	387be77303f852509753d19a5bfb3caea5a666a6
parent	33cb04de188e3a3f25864dfeecc0d178be420159 (diff)
download	android_device_qcom_sepolicy-b98aaace30213fd48f01cc498e04ec2ca06d670d.tar.gz android_device_qcom_sepolicy-b98aaace30213fd48f01cc498e04ec2ca06d670d.tar.bz2 android_device_qcom_sepolicy-b98aaace30213fd48f01cc498e04ec2ca06d670d.zip