diff --git a/init.qcom.devstart.sh b/init.qcom.devstart.sh
index 3589ac22..9650775c 100644
--- a/init.qcom.devstart.sh
+++ b/init.qcom.devstart.sh
@@ -7,4 +7,4 @@ setprop sys.qcom.devup 1
 version=`grep -ao "OEM_IMAGE_VERSION_STRING[ -~]*" \
               /vendor/firmware/slpi_v2.b04 | \
          sed -e s/OEM_IMAGE_VERSION_STRING=SLPI.version.// -e s/\(.*\).//`
-setprop sys.slpi.firmware.version "$version"
+setprop vendor.sys.slpi.firmware.version "$version"
diff --git a/sepolicy/public/te_macros b/sepolicy/public/te_macros
new file mode 100644
index 00000000..701ef555
--- /dev/null
+++ b/sepolicy/public/te_macros
@@ -0,0 +1,9 @@
+###########################################
+# dump_hal(hal_type)
+# Ability to dump the hal debug info
+#
+define(`dump_hal', `
+  hal_client_domain(dumpstate, $1);
+  allow $1_server dumpstate:fifo_file write;
+  allow $1_server dumpstate:fd use;
+')
diff --git a/sepolicy/vendor/con_monitor.te b/sepolicy/vendor/con_monitor.te
index e1ba346c..eeb6bf5e 100644
--- a/sepolicy/vendor/con_monitor.te
+++ b/sepolicy/vendor/con_monitor.te
@@ -4,6 +4,7 @@ type con_monitor_app, domain;
 app_domain(con_monitor_app)
 
 set_prop(con_monitor_app, radio_prop)
+userdebug_or_eng(`set_prop(con_monitor_app, dumpstate_options_prop)')
 allow con_monitor_app app_api_service:service_manager find;
 allow con_monitor_app radio_vendor_data_file:dir rw_dir_perms;
 allow con_monitor_app radio_vendor_data_file:file create_file_perms;
diff --git a/sepolicy/vendor/dumpstate.te b/sepolicy/vendor/dumpstate.te
index faa81a65..a0a8af40 100644
--- a/sepolicy/vendor/dumpstate.te
+++ b/sepolicy/vendor/dumpstate.te
@@ -1,3 +1,7 @@
+dump_hal(hal_thermal)
+dump_hal(hal_power)
+dump_hal(hal_power_stats)
+
 userdebug_or_eng(`
   allow dumpstate proc_modules:file r_file_perms;
   allow dumpstate proc_stat:file r_file_perms;
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 83081751..4e1447b7 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -64,7 +64,7 @@ vendor.gralloc.enable_ahardware_buffer  u:object_r:public_vendor_default_prop:s0
 # They are public_vendor_system_props for vendor-specific extension.
 sys.all.modules.ready      u:object_r:public_vendor_system_prop:s0
 sys.qcom.devup             u:object_r:public_vendor_system_prop:s0
-sys.slpi.firmware.version  u:object_r:public_vendor_system_prop:s0
+vendor.sys.slpi.firmware.version  u:object_r:public_vendor_system_prop:s0
 
 # vendor_default_prop
 # default_prop isn't accessible from vendor components.