diff --git a/gps/lsi/sepolicy/gnssd.te b/gps/lsi/sepolicy/gnssd.te
index 8450253..42c974e 100644
--- a/gps/lsi/sepolicy/gnssd.te
+++ b/gps/lsi/sepolicy/gnssd.te
@@ -25,3 +25,6 @@
 
 allow gnssd sysfs_soc:file r_file_perms;
 allow gnssd sysfs_gps:file rw_file_perms;
+
+# Allow gnssd to set GPS property
+set_prop(gnssd, vendor_gps_prop)
diff --git a/mte/OWNERS b/mte/OWNERS
new file mode 100644
index 0000000..929e941
--- /dev/null
+++ b/mte/OWNERS
@@ -0,0 +1,4 @@
+eugenis@google.com
+pcc@google.com
+mitchp@google.com
+fmayer@google.com
diff --git a/thermal/OWNERS b/thermal/OWNERS
new file mode 100644
index 0000000..5538b5f
--- /dev/null
+++ b/thermal/OWNERS
@@ -0,0 +1 @@
+include platform/hardware/google/pixel:/thermal/OWNERS
diff --git a/touch/twoshay/sepolicy/device.te b/touch/twoshay/sepolicy/device.te
deleted file mode 100644
index d3ce622..0000000
--- a/touch/twoshay/sepolicy/device.te
+++ /dev/null
@@ -1 +0,0 @@
-type touch_offload_device, dev_type;
diff --git a/touch/twoshay/sepolicy/dumpstate.te b/touch/twoshay/sepolicy/dumpstate.te
deleted file mode 100644
index 90f14b8..0000000
--- a/touch/twoshay/sepolicy/dumpstate.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow dumpstate touch_context_service:service_manager find;
-binder_call(dumpstate, twoshay)
diff --git a/touch/twoshay/sepolicy/file_contexts b/touch/twoshay/sepolicy/file_contexts
deleted file mode 100644
index 09728be..0000000
--- a/touch/twoshay/sepolicy/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-/dev/touch_offload                                                               u:object_r:touch_offload_device:s0
-/vendor/bin/twoshay                                                              u:object_r:twoshay_exec:s0
diff --git a/touch/twoshay/sepolicy/hal_dumpstate_default.te b/touch/twoshay/sepolicy/hal_dumpstate_default.te
deleted file mode 100644
index 81edc36..0000000
--- a/touch/twoshay/sepolicy/hal_dumpstate_default.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow hal_dumpstate_default touch_context_service:service_manager find;
-binder_call(hal_dumpstate_default, twoshay)
diff --git a/touch/twoshay/sepolicy/platform_app.te b/touch/twoshay/sepolicy/platform_app.te
deleted file mode 100644
index ac997a9..0000000
--- a/touch/twoshay/sepolicy/platform_app.te
+++ /dev/null
@@ -1,4 +0,0 @@
-allow platform_app gril_antenna_tuning_service:service_manager find;
-allow platform_app screen_protector_detector_service:service_manager find;
-allow platform_app touch_context_service:service_manager find;
-binder_call(platform_app, twoshay)
diff --git a/touch/twoshay/sepolicy/service.te b/touch/twoshay/sepolicy/service.te
deleted file mode 100644
index 4aa064d..0000000
--- a/touch/twoshay/sepolicy/service.te
+++ /dev/null
@@ -1,3 +0,0 @@
-type gril_antenna_tuning_service, service_manager_type, hal_service_type;
-type screen_protector_detector_service, service_manager_type, hal_service_type;
-type touch_context_service, service_manager_type, hal_service_type;
diff --git a/touch/twoshay/sepolicy/service_contexts b/touch/twoshay/sepolicy/service_contexts
deleted file mode 100644
index f6aa1db..0000000
--- a/touch/twoshay/sepolicy/service_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-com.google.input.ITouchContextService/default              u:object_r:touch_context_service:s0
-com.google.input.algos.gril.IGrilAntennaTuningService/default              u:object_r:gril_antenna_tuning_service:s0
-com.google.input.algos.spd.IScreenProtectorDetectorService/default u:object_r:screen_protector_detector_service:s0
diff --git a/touch/twoshay/sepolicy/touchflow_debug/file_contexts b/touch/twoshay/sepolicy/touchflow_debug/file_contexts
deleted file mode 100644
index 17dfe62..0000000
--- a/touch/twoshay/sepolicy/touchflow_debug/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-/vendor/bin/hw/android\.hardware\.input\.processor-reflector     u:object_r:hal_input_processor_default_exec:s0
-/vendor/bin/twoshay_touchflow     u:object_r:twoshay_exec:s0
diff --git a/touch/twoshay/sepolicy/twoshay.te b/touch/twoshay/sepolicy/twoshay.te
deleted file mode 100644
index cd317a0..0000000
--- a/touch/twoshay/sepolicy/twoshay.te
+++ /dev/null
@@ -1,27 +0,0 @@
-type twoshay, domain;
-type twoshay_exec, exec_type, vendor_file_type, file_type;
-
-init_daemon_domain(twoshay)
-
-allow twoshay touch_offload_device:chr_file rw_file_perms;
-allow twoshay twoshay:capability sys_nice;
-
-binder_use(twoshay)
-add_service(twoshay, gril_antenna_tuning_service)
-add_service(twoshay, screen_protector_detector_service)
-add_service(twoshay, touch_context_service)
-
-binder_call(twoshay, platform_app)
-
-allow twoshay fwk_stats_service:service_manager find;
-binder_call(twoshay, stats_service_server)
-
-# Allow dumpsys output in bugreports.
-allow twoshay dumpstate:fd use;
-allow twoshay dumpstate:fifo_file write;
-
-# b/198755236
-dontaudit twoshay twoshay:capability dac_override;
-
-# b/226830650
-dontaudit twoshay boot_status_prop:file read;
diff --git a/touch/twoshay/twoshay.mk b/touch/twoshay/twoshay.mk
deleted file mode 100644
index 20bf1ba..0000000
--- a/touch/twoshay/twoshay.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/twoshay/sepolicy
-PRODUCT_PACKAGES += twoshay
-PRODUCT_SOONG_NAMESPACES += vendor/google/input/twoshay