diff --git a/property.te b/property.te
index d2a238bc1dee1743410e45a132f5373fb646fb0d..83208cfe936d12bf25d9d39769545b7b2c7e012e 100644
--- a/property.te
+++ b/property.te
@@ -23,6 +23,7 @@ type ctl_bugreport_prop, property_type;
 type ctl_console_prop, property_type;
 type audio_prop, property_type, core_property_type;
 type log_prop, property_type, log_property_type;
+type log_tag_prop, property_type, log_property_type;
 type logd_prop, property_type, core_property_type;
 type mmc_prop, property_type;
 type restorecon_prop, property_type, core_property_type;
diff --git a/property_contexts b/property_contexts
index 70a80803b7f950f16abcfd268fb9ee55880e2b52..92a90ab795784a518fd46d0ec757edb81539a802 100644
--- a/property_contexts
+++ b/property_contexts
@@ -33,6 +33,7 @@ debug.                  u:object_r:debug_prop:s0
 debug.db.               u:object_r:debuggerd_prop:s0
 dumpstate.              u:object_r:dumpstate_prop:s0
 log.                    u:object_r:log_prop:s0
+log.tag.                u:object_r:log_tag_prop:s0
 log.tag.WifiHAL         u:object_r:wifi_log_prop:s0
 service.adb.root        u:object_r:shell_prop:s0
 service.adb.tcp.port    u:object_r:shell_prop:s0
@@ -41,7 +42,7 @@ persist.audio.          u:object_r:audio_prop:s0
 persist.debug.          u:object_r:persist_debug_prop:s0
 persist.logd.           u:object_r:logd_prop:s0
 persist.logd.security   u:object_r:device_logging_prop:s0
-persist.log.tag         u:object_r:log_prop:s0
+persist.log.tag.        u:object_r:log_tag_prop:s0
 persist.mmc.            u:object_r:mmc_prop:s0
 persist.sys.            u:object_r:system_prop:s0
 persist.sys.safemode    u:object_r:safemode_prop:s0
diff --git a/shell.te b/shell.te
index d8c6dd49b74a0cc5f5b0beb869b21d23ad4b0154..df79e2334e36ef1086fc7e745670f5b49cc71d59 100644
--- a/shell.te
+++ b/shell.te
@@ -63,8 +63,9 @@ set_prop(shell, ctl_dumpstate_prop)
 set_prop(shell, dumpstate_prop)
 set_prop(shell, debug_prop)
 set_prop(shell, powerctl_prop)
+set_prop(shell, log_tag_prop)
+set_prop(shell, wifi_log_prop)
 userdebug_or_eng(`set_prop(shell, log_prop)')
-userdebug_or_eng(`set_prop(shell, wifi_log_prop)')
 
 # systrace support - allow atrace to run
 allow shell debugfs_tracing:dir r_dir_perms;
diff --git a/system_app.te b/system_app.te
index b3f4b301903519095eb15d7aa89e75f902a5d69e..2d51c5a1017add7a5e726763fa498980396453ff 100644
--- a/system_app.te
+++ b/system_app.te
@@ -31,7 +31,7 @@ set_prop(system_app, system_prop)
 set_prop(system_app, logd_prop)
 set_prop(system_app, net_radio_prop)
 set_prop(system_app, system_radio_prop)
-set_prop(system_app, log_prop)
+set_prop(system_app, log_tag_prop)
 auditallow system_app net_radio_prop:property_service set;
 auditallow system_app system_radio_prop:property_service set;