diff --git a/device-common.mk b/device-common.mk
index 5e5a585..c378b61 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -114,6 +114,7 @@
     android.hardware.audio@2.0-service \
     android.hardware.bluetooth@1.0-service \
     android.hardware.contexthub@1.0-service \
+    android.hardware.gnss@1.0-service \
     android.hardware.light@2.0-service \
     android.hardware.memtrack@1.0-service \
     android.hardware.nfc@1.0-service \
@@ -458,8 +459,7 @@
 
 ifeq ($(ENABLE_TREBLE), true)
 PRODUCT_PACKAGES +=                         \
-    android.hardware.gatekeeper@1.0-service \
-    android.hardware.gnss@1.0-service
+    android.hardware.gatekeeper@1.0-service
 endif
 
 # Vibrator
diff --git a/vintf.xml b/vintf.xml
index 70e6610..7c13e84 100644
--- a/vintf.xml
+++ b/vintf.xml
@@ -55,7 +55,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.gnss</name>
-        <transport>passthrough</transport>
+        <transport>toggled</transport>
         <impl level="generic"></impl>
         <version>1.0</version>
     </hal>