diff --git a/camera/sepolicy/seapp_contexts b/camera/sepolicy/seapp_contexts
index f956929..e78385e 100644
--- a/camera/sepolicy/seapp_contexts
+++ b/camera/sepolicy/seapp_contexts
@@ -5,3 +5,5 @@ user=system seinfo=platform name=com.google.pixel.camera.services:* domain=vendo
 
 # Pixel Camera Services
 user=_app seinfo=CameraServices name=com.google.android.apps.camera.services domain=vendor_pcs_app type=app_data_file levelFrom=all
+# The :* will allow all services, which run in their own processes, to use the same vendor_pcs_app domain.
+user=_app seinfo=CameraServices name=com.google.android.apps.camera.services:* domain=vendor_pcs_app type=app_data_file levelFrom=all
diff --git a/storage/Android.bp b/storage/Android.bp
index 54e097e..c8671d1 100644
--- a/storage/Android.bp
+++ b/storage/Android.bp
@@ -5,6 +5,7 @@ package {
 sh_binary {
     name: "dump_storage.sh",
     src: "dump_storage.sh",
+    init_rc: ["init.storage.rc"],
     vendor: true,
     sub_dir: "dump",
 }
diff --git a/storage/init.storage.rc b/storage/init.storage.rc
new file mode 100644
index 0000000..445f74b
--- /dev/null
+++ b/storage/init.storage.rc
@@ -0,0 +1,2 @@
+on property:ro.build.type=userdebug
+    write /dev/sys/block/bootdevice/pixel/enable_pixel_ufs_logging 1
diff --git a/storage/sepolicy/file_contexts b/storage/sepolicy/file_contexts
index eda4cf7..a0efd28 100644
--- a/storage/sepolicy/file_contexts
+++ b/storage/sepolicy/file_contexts
@@ -1 +1,2 @@
 /vendor/bin/dump/dump_storage\.sh      u:object_r:dump_storage_exec:s0
+/sys/devices/platform/[0-9]+\.ufs/pixel/enable_pixel_ufs_logging  u:object_r:sysfs_scsi_devices_0000:s0