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"
   />