diff --git a/generic/vendor/common/file_contexts b/generic/vendor/common/file_contexts
index 7494cf4..79a290b 100644
--- a/generic/vendor/common/file_contexts
+++ b/generic/vendor/common/file_contexts
@@ -456,6 +456,7 @@
 /sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/auto_hibern8           u:object_r:vendor_sysfs_scsi_host:s0
 /sys/devices(/platform)?/soc/[a-f0-9]+/host0/scsi_host/host0(/.*)?  u:object_r:vendor_sysfs_scsi_host:s0
 /sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/host0/target0:0:0/0:0:0:[0-9]+/scsi_generic(/.*)?     u:object_r:vendor_sysfs_scsi_target:s0
+/sys/devices/virtual/bdi/[0-9]+:[0-9]+/read_ahead_kb                u:object_r:vendor_sysfs_mmc_host:s0
 
 # VM Neuron block device mapping node
 /sys/devices/platform/soc/soc:qcom,svm_neuron_block/soc:qcom,svm_neuron_block:application/blk_name  u:object_r:vendor_sysfs_svm_neuron:s0
diff --git a/generic/vendor/msmnile/file_contexts b/generic/vendor/msmnile/file_contexts
index 8197586..9422455 100644
--- a/generic/vendor/msmnile/file_contexts
+++ b/generic/vendor/msmnile/file_contexts
@@ -75,6 +75,7 @@
 /dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab]       u:object_r:vendor_mdtp_device:s0
 /dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab]            u:object_r:vendor_modem_block_device:s0
 /dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab]            u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgqti_[ab]      u:object_r:vendor_custom_ab_block_device:s0
 /dev/block/platform/soc/1d84000.ufshc/by-name/persist               u:object_r:vendor_persist_block_device:s0
 /dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab]             u:object_r:vendor_custom_ab_block_device:s0
 /dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab]            u:object_r:vendor_custom_ab_block_device:s0
diff --git a/generic/vendor/msmsteppe/file_contexts b/generic/vendor/msmsteppe/file_contexts
index 9ab139d..a0bddf3 100644
--- a/generic/vendor/msmsteppe/file_contexts
+++ b/generic/vendor/msmsteppe/file_contexts
@@ -172,7 +172,5 @@
 ###################################
 # sysfs read_ahead_kb files
 #
-/sys/devices/virtual/bdi/179:0/read_ahead_kb  u:object_r:vendor_sysfs_mmc_host:s0
-/sys/devices/virtual/bdi/179:32/read_ahead_kb  u:object_r:vendor_sysfs_mmc_host:s0
 /sys/devices/platform/soc/7c4000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/queue/read_ahead_kb u:object_r:vendor_sysfs_mmc_host:s0
 /sys/devices/platform/soc/7c4000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0rpmb/queue/read_ahead_kb u:object_r:vendor_sysfs_mmc_host:s0
diff --git a/legacy/vendor/common/cnd.te b/legacy/vendor/common/cnd.te
index 6379afa..50a4dd1 100755
--- a/legacy/vendor/common/cnd.te
+++ b/legacy/vendor/common/cnd.te
@@ -120,6 +120,7 @@
 binder_call(cnd, ims)
 binder_call(cnd, location)
 
+add_hwservice(cnd, vendor_hal_mwqemadapter_hwservice)
 add_hwservice(cnd, vendor_hal_slmadapter_hwservice)
 
 get_prop(cnd, vendor_slm_prop)
diff --git a/legacy/vendor/common/hal_nfc.te b/legacy/vendor/common/hal_nfc.te
index e4dcada..5b35c3c 100644
--- a/legacy/vendor/common/hal_nfc.te
+++ b/legacy/vendor/common/hal_nfc.te
@@ -31,4 +31,5 @@
 #Allow access to firmware
 allow hal_nfc firmware_file:dir r_dir_perms;
 allow hal_nfc firmware_file:file r_file_perms;
-allow hal_nfc nfc_vendor_data_file:file rw_file_perms;
+allow hal_nfc nfc_vendor_data_file:dir rw_dir_perms;
+allow hal_nfc nfc_vendor_data_file:file create_file_perms;
diff --git a/legacy/vendor/common/hwservice.te b/legacy/vendor/common/hwservice.te
index 354f404..30fc5ee 100644
--- a/legacy/vendor/common/hwservice.te
+++ b/legacy/vendor/common/hwservice.te
@@ -70,4 +70,5 @@
 type vendor_hal_dspmanager_hwservice, hwservice_manager_type;
 type vendor_hal_qccvndhal_hwservice, hwservice_manager_type, protected_hwservice;
 type vendor_hal_limits_hwservice, hwservice_manager_type, protected_hwservice;
+type vendor_hal_mwqemadapter_hwservice, hwservice_manager_type, protected_hwservice;
 type vendor_hal_slmadapter_hwservice, hwservice_manager_type, protected_hwservice;
diff --git a/legacy/vendor/common/hwservice_contexts b/legacy/vendor/common/hwservice_contexts
index 9ed260d..3f9b63a 100644
--- a/legacy/vendor/common/hwservice_contexts
+++ b/legacy/vendor/common/hwservice_contexts
@@ -115,4 +115,5 @@
 vendor.qti.hardware.perf::IPerfCallback                      u:object_r:hal_perfcallback_hwservice:s0
 vendor.qti.hardware.dsp::IDspService                         u:object_r:vendor_hal_dspmanager_hwservice:s0
 vendor.qti.hardware.qccvndhal::IQccvndhal                     u:object_r:vendor_hal_qccvndhal_hwservice:s0
+vendor.qti.hardware.mwqemadapter::IMwqemAdapter              u:object_r:vendor_hal_mwqemadapter_hwservice:s0
 vendor.qti.hardware.slmadapter::ISlmAdapter                  u:object_r:vendor_hal_slmadapter_hwservice:s0
diff --git a/legacy/vendor/common/location.te b/legacy/vendor/common/location.te
index bfbe9f5..715d15f 100644
--- a/legacy/vendor/common/location.te
+++ b/legacy/vendor/common/location.te
@@ -130,3 +130,5 @@
 
 #allow qdma prop
 #get_prop(location, vendor_qdma_prop);
+
+get_prop(location, wifi_hal_prop)
diff --git a/qva/vendor/bengal/file_contexts b/qva/vendor/bengal/file_contexts
index b741416..faf5046 100644
--- a/qva/vendor/bengal/file_contexts
+++ b/qva/vendor/bengal/file_contexts
@@ -169,7 +169,6 @@
 #
 /sys/devices/platform/soc/1b40000.qfprom/qfprom0/feat_conf1[0-1]            u:object_r:vendor_sysfs_qfprom:s0
 /sys/devices/platform/soc/4744000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/queue/read_ahead_kb u:object_r:vendor_sysfs_mmc_host:s0
-/sys/devices/virtual/bdi/[0-9]+:[0-9]+/read_ahead_kb                                              u:object_r:vendor_sysfs_mmc_host:s0
 
 ###################################
 #camera