diff --git a/system_ext/private/property_contexts b/system_ext/private/property_contexts
index d555ab6..f08d9e4 100644
--- a/system_ext/private/property_contexts
+++ b/system_ext/private/property_contexts
@@ -1,3 +1,6 @@
+# TODO(b/246793311): Clean up a temporary property once pa/2342172 lands
+debug.sf.ignore_hwc_physical_display_orientation u:object_r:surfaceflinger_prop:s0 exact bool
+
 # Default orienation for boot animation counted from natural orienation of the device
 # Id at the end corresponds to the display id on the device. See b/246793311 for context.
 ro.bootanim.set_orientation_4619827677550801152 u:object_r:surfaceflinger_prop:s0 exact enum ORIENTATION_0 ORIENTATION_90 ORIENTATION_180 ORIENTATION_270
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 3cf5e4c..c77f421 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1 +1,4 @@
+hal_camera_default boot_status_prop file b/275001805
+hal_camera_default edgetpu_app_service service_manager b/275001805
 hal_dumpstate_default modem_stat_data_file dir b/239115418
+shell sysfs_touch dir b/264823366
diff --git a/tracking_denials/shell.te b/tracking_denials/shell.te
deleted file mode 100644
index 44ae520..0000000
--- a/tracking_denials/shell.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# b/262179373
-dontaudit shell sysfs_touch:dir { search };
-
diff --git a/vendor/file.te b/vendor/file.te
index 32ab75b..a863220 100644
--- a/vendor/file.te
+++ b/vendor/file.te
@@ -3,3 +3,6 @@ type sysfs_pogo_usb, sysfs_type, fs_type;
 
 # Cast device certificate
 type device_cert_file, file_type, vendor_persist_type;
+
+# Avoid GPS se failed
+type sysfs_gps, sysfs_type, fs_type;
diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts
index dc21018..4b06cfb 100644
--- a/vendor/genfs_contexts
+++ b/vendor/genfs_contexts
@@ -3,14 +3,6 @@ genfscon sysfs /devices/platform/google,dock/power_supply/dock         u:object_
 
 # Touch
 genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0   u:object_r:sysfs_touch:s0
-genfscon proc  /nvt_baseline                                           u:object_r:proc_touch:s0
-genfscon proc  /nvt_cc_uniformity                                      u:object_r:proc_touch:s0
-genfscon proc  /nvt_diff                                               u:object_r:proc_touch:s0
-genfscon proc  /nvt_fw_update                                          u:object_r:proc_touch:s0
-genfscon proc  /nvt_fw_version                                         u:object_r:proc_touch:s0
-genfscon proc  /nvt_heatmap                                            u:object_r:proc_touch:s0
-genfscon proc  /nvt_raw                                                u:object_r:proc_touch:s0
-genfscon proc  /nvt_selftest                                           u:object_r:proc_touch:s0
 
 # system suspend wakeup files
 genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-6/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
diff --git a/vendor/system_server.te b/vendor/system_server.te
index b17b985..ba82449 100644
--- a/vendor/system_server.te
+++ b/vendor/system_server.te
@@ -1 +1 @@
-allow system_server sysfs_touch:file r_file_perms;
+allow system_server sysfs_touch_gti:file r_file_perms;