diff --git a/device.mk b/device.mk
index 6f07352c..e3818ced 100644
--- a/device.mk
+++ b/device.mk
@@ -1193,6 +1193,7 @@ endif
 
 # Touch service
 include hardware/google/pixel/input/twoshay.mk
+include device/google/gs-common/touch/twoshay/aidl_zuma.mk
 
 # Allow longer timeout for incident report generation in bugreport
 # Overriding in /product partition instead of /vendor intentionally,
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index a59ac59f..ba83dfa4 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -120,30 +120,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.input.algos.spd</name>
-        <version>2</version>
-        <interface>
-            <name>IScreenProtectorDetectorService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.input</name>
-        <version>1-2</version>
-        <interface>
-            <name>ITouchContextService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.input.algos.gril</name>
-        <version>2</version>
-        <interface>
-            <name>IGrilAntennaTuningService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>hardware.qorvo.uwb</name>
         <interface>
diff --git a/manifest.xml b/manifest.xml
index a71c165d..69a1bcdd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -12,28 +12,4 @@
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>
     </hal>
-    <hal format="aidl">
-        <name>com.google.input.algos.spd</name>
-        <version>2</version>
-        <interface>
-            <name>IScreenProtectorDetectorService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl">
-        <name>com.google.input</name>
-        <version>2</version>
-        <interface>
-            <name>ITouchContextService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl">
-        <name>com.google.input.algos.gril</name>
-        <version>2</version>
-        <interface>
-            <name>IGrilAntennaTuningService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>