diff --git a/usf/sensor_hal.te b/usf/sensor_hal.te
index ac9d5c2..bda44c9 100644
--- a/usf/sensor_hal.te
+++ b/usf/sensor_hal.te
@@ -59,6 +59,9 @@
 allow hal_sensors_default hal_pixel_display_service:service_manager find;
 binder_call(hal_sensors_default, hal_graphics_composer_default)
 
+# Allow sensor HAL to access to display sysfs.
+allow hal_sensors_default sysfs_display:file r_file_perms;
+
 #
 # Suez type enforcements.
 #
diff --git a/whitechapel/vendor/google/charger_vendor.te b/whitechapel/vendor/google/charger_vendor.te
index 7b914da..df59b71 100644
--- a/whitechapel/vendor/google/charger_vendor.te
+++ b/whitechapel/vendor/google/charger_vendor.te
@@ -1,4 +1,5 @@
 allow charger_vendor mnt_vendor_file:dir search;
+allow charger_vendor sysfs_batteryinfo:file w_file_perms;
 allow charger_vendor persist_file:dir search;
 allow charger_vendor persist_battery_file:dir search;
 allow charger_vendor persist_battery_file:file rw_file_perms;
diff --git a/whitechapel/vendor/google/hal_power_stats_default.te b/whitechapel/vendor/google/hal_power_stats_default.te
index db81a74..13a0487 100644
--- a/whitechapel/vendor/google/hal_power_stats_default.te
+++ b/whitechapel/vendor/google/hal_power_stats_default.te
@@ -15,6 +15,7 @@
 
 binder_call(hal_power_stats_default, citadeld)
 r_dir_file(hal_power_stats_default, sysfs_aoc)
+r_dir_file(hal_power_stats_default, sysfs_aoc_dumpstate)
 r_dir_file(hal_power_stats_default, sysfs_cpu)
 r_dir_file(hal_power_stats_default, sysfs_leds)
 r_dir_file(hal_power_stats_default, sysfs_acpm_stats)
diff --git a/whitechapel/vendor/google/service.te b/whitechapel/vendor/google/service.te
index aa60e3f..8d5dc1e 100644
--- a/whitechapel/vendor/google/service.te
+++ b/whitechapel/vendor/google/service.te
@@ -1,3 +1,2 @@
 type hal_pixel_display_service, service_manager_type, vendor_service;
-type uwb_vendor_service, service_manager_type, vendor_service;
 type hal_uwb_vendor_service, service_manager_type, vendor_service;
diff --git a/whitechapel/vendor/google/service_contexts b/whitechapel/vendor/google/service_contexts
index ca2ec93..2510886 100644
--- a/whitechapel/vendor/google/service_contexts
+++ b/whitechapel/vendor/google/service_contexts
@@ -1,4 +1,3 @@
 com.google.hardware.pixel.display.IDisplay/default         u:object_r:hal_pixel_display_service:s0
-uwb_vendor                                                 u:object_r:uwb_vendor_service:s0
 hardware.qorvo.uwb.IUwbVendor/default                      u:object_r:hal_uwb_vendor_service:s0
 android.hardware.drm.IDrmFactory/widevine                  u:object_r:hal_drm_service:s0
diff --git a/whitechapel/vendor/google/system_server.te b/whitechapel/vendor/google/system_server.te
index b256394..d064cb7 100644
--- a/whitechapel/vendor/google/system_server.te
+++ b/whitechapel/vendor/google/system_server.te
@@ -1,8 +1,6 @@
 # Allow system server to send sensor data callbacks to GPS and camera HALs
 binder_call(system_server, gpsd);
 binder_call(system_server, hal_camera_default);
-# Allow system server to find vendor uwb service
-allow system_server uwb_vendor_service:service_manager find;
 
 # pixelstats_vendor/OrientationCollector
 binder_call(system_server, pixelstats_vendor)
diff --git a/whitechapel/vendor/google/uwb_vendor_app.te b/whitechapel/vendor/google/uwb_vendor_app.te
index 8822343..68edcb1 100644
--- a/whitechapel/vendor/google/uwb_vendor_app.te
+++ b/whitechapel/vendor/google/uwb_vendor_app.te
@@ -2,8 +2,6 @@
 
 app_domain(uwb_vendor_app)
 
-add_service(uwb_vendor_app, uwb_vendor_service)
-
 not_recovery(`
 hal_client_domain(uwb_vendor_app, hal_uwb_vendor)