diff --git a/device-lynx.mk b/device-lynx.mk
index d38fa58..5803dfd 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -340,5 +340,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.device_id=lynx
 
 # Bluetooth device id
+# Raven: 0x410B
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20491
+    bluetooth.device_id.product_id=16651
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10
index 95ee3bf..4a4b847 100644
--- a/location/gps.6.1.xml.l10
+++ b/location/gps.6.1.xml.l10
@@ -57,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
@@ -96,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/location/gps.xml.l10 b/location/gps.xml.l10
index 5e7e291..b4d355c 100644
--- a/location/gps.xml.l10
+++ b/location/gps.xml.l10
@@ -57,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
@@ -96,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10
index 0331e0d..27a5a53 100644
--- a/location/gps_user.6.1.xml.l10
+++ b/location/gps_user.6.1.xml.l10
@@ -95,6 +95,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10
index 1c4b639..6f62071 100644
--- a/location/gps_user.xml.l10
+++ b/location/gps_user.xml.l10
@@ -95,6 +95,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk
index b3cd8b8..9b10eb1 100644
--- a/lynx/BoardConfig.mk
+++ b/lynx/BoardConfig.mk
@@ -40,6 +40,13 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx-sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/manifest.xml b/manifest.xml
index 38a4af5..3fe5807 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <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="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>