diff --git a/logd.te b/logd.te
index 97bbd8be3093b264d2cf5f24bec54d47fc0e39ed..bc97a37546ddfadef073b0f82b3427c159ef4413 100644
--- a/logd.te
+++ b/logd.te
@@ -28,6 +28,7 @@ set_prop(logd, powerctl_prop)
 
 # Access device logging gating property
 get_prop(logd, device_logging_prop)
+userdebug_or_eng(`get_prop(logd, logpersistd_logging_prop)')
 
 r_dir_file(logd, domain)
 
diff --git a/property.te b/property.te
index 26d15ff40d75d98ac4b3128f0a0778e0f3585591..6d3ba4f1c08542d87873f361b742127b14b1d8c0 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 logd_prop, property_type, core_property_type;
+type logpersistd_logging_prop, property_type;
 type mmc_prop, property_type;
 type restorecon_prop, property_type, core_property_type;
 type security_prop, property_type, core_property_type;
diff --git a/property_contexts b/property_contexts
index 06e9cc8b4f2a3b6eb177aa7620cb46114c916448..d48473b9b53cc155df5bc4ea0c9ca0449da7699e 100644
--- a/property_contexts
+++ b/property_contexts
@@ -42,6 +42,7 @@ persist.bluetooth.      u:object_r:bluetooth_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.logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
 persist.log.tag         u:object_r:logd_prop:s0
 persist.mmc.            u:object_r:mmc_prop:s0
 persist.sys.            u:object_r:system_prop:s0
diff --git a/shell.te b/shell.te
index 610ed3ff79e8002833669fa740914172f9396098..c263f0ccdfc0e170ba9e74ef1e2e5a65683a4df0 100644
--- a/shell.te
+++ b/shell.te
@@ -63,6 +63,7 @@ set_prop(shell, ctl_dumpstate_prop)
 set_prop(shell, dumpstate_prop)
 set_prop(shell, debug_prop)
 set_prop(shell, powerctl_prop)
+userdebug_or_eng(`set_prop(shell, logpersistd_logging_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 355f6d4a80465045f85f478d80cf5e0d8d0c2ea7..4c9c1362950438604f4c0028d5601773312a83b4 100644
--- a/system_app.te
+++ b/system_app.te
@@ -29,6 +29,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)
+userdebug_or_eng(`set_prop(system_app, logpersistd_logging_prop)')
 auditallow system_app net_radio_prop:property_service set;
 auditallow system_app system_radio_prop:property_service set;