diff --git a/non_plat/em_svr.te b/non_plat/em_svr.te
index 08539e1..94e19e1 100644
--- a/non_plat/em_svr.te
+++ b/non_plat/em_svr.te
@@ -31,4 +31,7 @@ allow em_svr nvram_device:blk_file { open read write };
 # Purpose: add for Gyroscope sensor
 allow em_svr gyroscope_device:chr_file { read ioctl open };
 
-
+# Date : 2018/05/03
+# Purpose: allow EM to control battery
+allow em_svr battery_node:dir search;
+allow em_svr battery_node:file { write open };
diff --git a/non_plat/property.te b/non_plat/property.te
index 130c814..e48900b 100644
--- a/non_plat/property.te
+++ b/non_plat/property.te
@@ -167,3 +167,12 @@ type vendor_radio_prop, property_type, mtk_core_property_type;
 
 #=============allow bluetooth==============
 type vendor_bluetooth_prop, property_type, mtk_core_property_type;
+
+#=============allow EM to set modem reset delay property================
+type mtk_debug_md_reset_prop, property_type, mtk_core_property_type;
+
+#=============allow EM to set wifi log level property================
+type mtk_debug_wifi_level_prop, property_type, mtk_core_property_type;
+
+#=============allow EM to set BT ssp debug mode property================
+type mtk_bt_sspdebug_prop, property_type, mtk_core_property_type;
diff --git a/non_plat/property_contexts b/non_plat/property_contexts
index 466056e..89b153e 100644
--- a/non_plat/property_contexts
+++ b/non_plat/property_contexts
@@ -176,3 +176,13 @@ persist.vendor.radio. u:object_r:vendor_radio_prop:s0
 
 #=============allow bluetooth==============
 vendor.bthcisnoop u:object_r:vendor_bluetooth_prop:s0
+
+#=============allow EM to set modem reset delay property================
+vendor.mediatek.debug.md.reset.wait u:object_r:mtk_debug_md_reset_prop:s0
+
+#=============allow EM to set wifi log level property================
+persist.vendor.debug.wifi_driver_level u:object_r:mtk_debug_wifi_level_prop:s0
+persist.vendor.debug.wifi_fw_level u:object_r:mtk_debug_wifi_level_prop:s0
+
+#=============allow EM to set BT ssp debug mode property================
+persist.vendor.bt.sspdebug.enable u:object_r:mtk_bt_sspdebug_prop:s0
diff --git a/non_plat/radio.te b/non_plat/radio.te
index b84b780..2854dc8 100644
--- a/non_plat/radio.te
+++ b/non_plat/radio.te
@@ -161,11 +161,6 @@ binder_call(radio, mtk_hal_power)
 # Purpose : Allow YGPS trigger mnld NE
 set_prop(radio, mnld_prop)
 
-# Date : WK17.42
-# Operation: New feature for Wi-FI Log UI
-# Purpose: Allow EM store wifi log level in system property
-set_prop(radio, persist_debug_prop)
-
 # Date : 2017/10/31
 # Purpose: Policy for EM to set wcn coredump property
 set_prop(radio, wmt_prop)
@@ -184,3 +179,18 @@ get_prop(radio, tel_switch_prop)
 #Date: W1817
 #Purpose: allow rild access property of vendor_radio_prop
 set_prop(radio, vendor_radio_prop)
+
+# Date : 2018/05/03
+# Operation: P migration
+# Purpose: allow EM to set modem reset delay property
+set_prop(radio, mtk_debug_md_reset_prop)
+
+# Date : 2018/05/09
+# Operation: P migration
+# Purpose: Allow EM store wifi log level in system property
+set_prop(radio, mtk_debug_wifi_level_prop)
+
+# Date : 2018/05/10
+# Operation: P migration
+# Purpose: Allow EM to set BT ssp debug mode property
+set_prop(radio, mtk_bt_sspdebug_prop)