diff --git a/device.mk b/device.mk
index e0f6674..3531ca6 100644
--- a/device.mk
+++ b/device.mk
@@ -556,7 +556,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
 	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator-V2-service
+	android.hardware.graphics.allocator-V1-service
 
 PRODUCT_PACKAGES += \
 	memtrack.$(TARGET_BOARD_PLATFORM) \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d2e6071..c20d40e 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -127,6 +127,14 @@
             <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>com.google.input</name>
         <interface>
diff --git a/manifest.xml b/manifest.xml
index e5c9f76..64b1764 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -19,6 +19,14 @@
             <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>
     <hal format="aidl">
         <name>com.google.input</name>
         <interface>