diff --git a/private/system_suspend.te b/private/system_suspend.te
deleted file mode 100644
index f126523a..00000000
--- a/private/system_suspend.te
+++ /dev/null
@@ -1,3 +0,0 @@
-userdebug_or_eng(`
-  permissive system_suspend;
-')
diff --git a/tracking_denials/system_suspend.te b/tracking_denials/system_suspend.te
index 2f92afdc..7c6fd8b6 100644
--- a/tracking_denials/system_suspend.te
+++ b/tracking_denials/system_suspend.te
@@ -1,21 +1,4 @@
-# b/260366031
-dontaudit system_suspend_server sysfs:dir { open };
-dontaudit system_suspend_server sysfs:dir { read };
-dontaudit system_suspend_server sysfs:file { getattr };
-dontaudit system_suspend_server sysfs:file { open };
-dontaudit system_suspend_server sysfs:file { read };
-dontaudit system_suspend_server sysfs_aoc:dir { open };
-dontaudit system_suspend_server sysfs_aoc:dir { read };
-dontaudit system_suspend_server sysfs_aoc:file { getattr };
-dontaudit system_suspend_server sysfs_aoc:file { open };
-dontaudit system_suspend_server sysfs_aoc:file { read };
 # b/261105356
 dontaudit system_suspend_server chre:binder { transfer };
 # b/263305203
 dontaudit system_suspend_server tee:binder { transfer };
-# b/264204215
-dontaudit system_suspend_server sysfs_batteryinfo:dir { open };
-dontaudit system_suspend_server sysfs_batteryinfo:dir { read };
-dontaudit system_suspend_server sysfs_batteryinfo:file { getattr };
-dontaudit system_suspend_server sysfs_batteryinfo:file { open };
-dontaudit system_suspend_server sysfs_batteryinfo:file { read };
diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts
index 3a366d75..f60a3399 100644
--- a/vendor/genfs_contexts
+++ b/vendor/genfs_contexts
@@ -289,10 +289,22 @@ genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-8/8-0036/power_supply/maxfg/
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-8/8-0057/power_supply/pca94xx-mains/wakeup                            u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-8/8-0069/power_supply/dc/wakeup                                       u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-8/8-0069/power_supply/main-charger/wakeup                             u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-0/0-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-1/1-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-2/2-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-3/3-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-4/4-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-5/5-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-6/6-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-7/7-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-8/8-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-9/9-0057/power_supply/dc-mains/wakeup                                 u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/wakeup/wakeup                                                 u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/13120000.pcie/pci0001:00/0001:00:00.0/0001:01:00.0/wakeup/wakeup                         u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/17000000.aoc/com.google.usf.non_wake_up/wakeup/wakeup                                    u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/17000000.aoc/com.google.usf/wakeup/wakeup                                                u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/17000000.aoc/usb_control/wakeup                                                          u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/17000000.aoc/wakeup                                                                      u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/acpm_mfd_bus@15500000/i2c-0/0-001f/s2mpg14-meter/s2mpg14-odpm/wakeup/wakeup              u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/acpm_mfd_bus@15500000/i2c-0/0-001f/s2mpg14-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup/wakeup  u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/acpm_mfd_bus@15500000/i2c-0/0-001f/s2mpg14-rtc/wakeup/wakeup                             u:object_r:sysfs_wakeup:s0