diff --git a/dumpstate.te b/dumpstate.te
index 64ca3010c6baacb04f199fa6b9ac27eb87b23eea..b1ae22b36cf418bd9647604e101679fe11d53f73 100644
--- a/dumpstate.te
+++ b/dumpstate.te
@@ -82,6 +82,9 @@ domain_auto_trans(dumpstate, vdc_exec, vdc)
 # TODO: create a new file class, instead of allowing write access to all of /sys
 allow dumpstate sysfs:file w_file_perms;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow dumpstate sysfs_usb:file w_file_perms;
+
 # Other random bits of data we want to collect
 allow dumpstate qtaguid_proc:file r_file_perms;
 allow dumpstate debugfs:file r_file_perms;
diff --git a/gpsd.te b/gpsd.te
index 4b22223142825d9ee7345752422737f719b1a9ec..cd202958f4cf17de53a3bf73c241c176757af267 100644
--- a/gpsd.te
+++ b/gpsd.te
@@ -13,6 +13,9 @@ allow gpsd gps_socket:sock_file create_file_perms;
 # XXX Label sysfs files with a specific type?
 allow gpsd sysfs:file rw_file_perms;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow gpsd sysfs_usb:file w_file_perms;
+
 allow gpsd gps_device:chr_file rw_file_perms;
 
 # Execute the shell or system commands.
diff --git a/healthd.te b/healthd.te
index f54d716a9b0ca34452b820657b19a0160fee9cee..2658ef84c2ae3e3a0447628469b1bcec847959c7 100644
--- a/healthd.te
+++ b/healthd.te
@@ -19,6 +19,9 @@ binder_call(healthd, system_server)
 # TODO:  Split into a separate type?
 allow healthd sysfs:file write;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow healthd sysfs_usb:file write;
+
 allow healthd sysfs_batteryinfo:file r_file_perms;
 
 ###
diff --git a/netd.te b/netd.te
index 0d9c047a4c17c168df36b564803012c76fd1e765..9b44e4bdfe192d19b871dc050b013d74947479f9 100644
--- a/netd.te
+++ b/netd.te
@@ -32,6 +32,9 @@ allow netd proc_net:file write;
 # XXX Split into its own type.
 allow netd sysfs:file write;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow netd sysfs_usb:file write;
+
 # Needed to update /data/misc/wifi/hostapd.conf
 # TODO: See what we can do to reduce the need for
 # these capabilities
diff --git a/nfc.te b/nfc.te
index 2ca43dddfd292be7fb56445c1b5cdc5a2d907b97..5b7f4b9f08dfb7c589967626fb0e5e341f28c6d0 100644
--- a/nfc.te
+++ b/nfc.te
@@ -17,6 +17,9 @@ allow nfc nfc_data_file:notdevfile_class_set create_file_perms;
 allow nfc sysfs_nfc_power_writable:file rw_file_perms;
 allow nfc sysfs:file write;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow nfc sysfs_usb:file write;
+
 # SoundPool loading and playback
 allow nfc mediaserver_service:service_manager find;
 allow nfc audioserver_service:service_manager find;
diff --git a/system_server.te b/system_server.te
index e1b2f58427a5d0bd4c7542d5741b8587c63ed9b7..e74f58cebe7fe6eb7898e56d27abcd9ff8077e60 100644
--- a/system_server.te
+++ b/system_server.te
@@ -190,6 +190,9 @@ allow system_server sysfs_mac_address:file r_file_perms;
 allow system_server sysfs_thermal:dir search;
 allow system_server sysfs_thermal:file r_file_perms;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow system_server sysfs_usb:file w_file_perms;
+
 # Access devices.
 allow system_server device:dir r_dir_perms;
 allow system_server mdns_socket:sock_file rw_file_perms;
diff --git a/ueventd.te b/ueventd.te
index 3881445ee321fdb3c518d4cecd636d8174b052d1..9a24357be3d8d3cedc5d1d282f48b9f3badf75d5 100644
--- a/ueventd.te
+++ b/ueventd.te
@@ -14,6 +14,7 @@ allow ueventd self:capability { chown mknod net_admin setgid fsetid sys_rawio da
 allow ueventd device:file create_file_perms;
 allow ueventd device:chr_file rw_file_perms;
 allow ueventd sysfs:file rw_file_perms;
+allow ueventd sysfs_usb:file w_file_perms;
 allow ueventd sysfs_hwrandom:file w_file_perms;
 allow ueventd sysfs_zram_uevent:file w_file_perms;
 allow ueventd sysfs_type:{ file lnk_file } { relabelfrom relabelto setattr getattr };
diff --git a/vold.te b/vold.te
index 6d5d9942e044fa0d5aa98be4e0c25569ec7c8c54..8cea0c3c70b6fa67ddebbc36f7918f07571a5183 100644
--- a/vold.te
+++ b/vold.te
@@ -90,6 +90,9 @@ allow vold self:capability { sys_ptrace kill };
 # XXX Label sysfs files with a specific type?
 allow vold sysfs:file rw_file_perms;
 
+# TODO: added to match above sysfs rule. Remove me?
+allow vold sysfs_usb:file w_file_perms;
+
 allow vold kmsg_device:chr_file rw_file_perms;
 
 # Run fsck in the fsck domain.