diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 6496ad0..bb3ab52 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -43,6 +43,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
 include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk
 
 $(call soong_config_set,google3a_config,target_device,bluejay)
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 079bd7b..7c70b6e 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -309,5 +309,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
 # Bluetooth device id
+# Bluejay: 0x4108
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20488
+    bluetooth.device_id.product_id=16648
diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3
index 7b68fcb..9ab8fc6 100644
--- a/gps.6.1.xml.b3
+++ b/gps.6.1.xml.b3
@@ -57,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -95,6 +96,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/gps.xml.b3 b/gps.xml.b3
index 25081c8..11c0734 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -57,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -95,6 +96,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3
index fb8c15a..8679528 100644
--- a/gps_user.6.1.xml.b3
+++ b/gps_user.6.1.xml.b3
@@ -94,6 +94,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/gps_user.xml.b3 b/gps_user.xml.b3
index 8d15786..d677aef 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -94,6 +94,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />