diff --git a/device.mk b/device.mk
index 726de305..eeecde31 100644
--- a/device.mk
+++ b/device.mk
@@ -212,6 +212,7 @@ USE_LASSEN_OEMHOOK := true
 ifneq ($(BOARD_WITHOUT_RADIO),true)
     PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
     $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
+    $(call soong_config_set,grilservice,use_google_qns,true)
 endif
 
 # Use for GRIL
diff --git a/manifest.xml b/manifest.xml
index 34b0326d..8c6ed15e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,4 @@
 <manifest version="1.0" type="device" target-level="7">
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>