diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index 02bd4338..80ca3bd7 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/user/gps.cfg
@@ -19,9 +19,12 @@ Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 0
 Chip_Configuration_FeatureCfg_DFS = 0
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
@@ -36,7 +39,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index 8d5203bc..3286aa6c 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/userdebug/gps.cfg
@@ -96,7 +96,12 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
 #Chip_Configuration_IspTestConfig=0x22242822
 
 # Disable BDS in the U.S.
+# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
+#gloUsedInUSPolicy=2
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
@@ -108,9 +113,7 @@ Chip_Configuration_FeatureCfg_DFS = 0
 # APM  = 0x2
 # CP   = 0x4
 # CHUB = 0x8
-# The CHUB on the neus continually triggers a bit so this is to prevent
-# it from continually waking the gnss.
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 
 ### Specify RFIC ID for K42 ###
 # 55400000 = S5540 EVT0
@@ -156,7 +159,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index 02bd4338..80ca3bd7 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/user/gps.cfg
@@ -19,9 +19,12 @@ Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 0
 Chip_Configuration_FeatureCfg_DFS = 0
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
@@ -36,7 +39,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index 8d5203bc..3286aa6c 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/userdebug/gps.cfg
@@ -96,7 +96,12 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
 #Chip_Configuration_IspTestConfig=0x22242822
 
 # Disable BDS in the U.S.
+# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
+#gloUsedInUSPolicy=2
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
@@ -108,9 +113,7 @@ Chip_Configuration_FeatureCfg_DFS = 0
 # APM  = 0x2
 # CP   = 0x4
 # CHUB = 0x8
-# The CHUB on the neus continually triggers a bit so this is to prevent
-# it from continually waking the gnss.
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 
 ### Specify RFIC ID for K42 ###
 # 55400000 = S5540 EVT0
@@ -156,7 +159,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index 02bd4338..80ca3bd7 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/user/gps.cfg
@@ -19,9 +19,12 @@ Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 0
 Chip_Configuration_FeatureCfg_DFS = 0
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
@@ -36,7 +39,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index 8d5203bc..3286aa6c 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/userdebug/gps.cfg
@@ -96,7 +96,12 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
 #Chip_Configuration_IspTestConfig=0x22242822
 
 # Disable BDS in the U.S.
+# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
+#gloUsedInUSPolicy=2
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
@@ -108,9 +113,7 @@ Chip_Configuration_FeatureCfg_DFS = 0
 # APM  = 0x2
 # CP   = 0x4
 # CHUB = 0x8
-# The CHUB on the neus continually triggers a bit so this is to prevent
-# it from continually waking the gnss.
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 
 ### Specify RFIC ID for K42 ###
 # 55400000 = S5540 EVT0
@@ -156,7 +159,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index 02bd4338..80ca3bd7 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/user/gps.cfg
@@ -19,9 +19,12 @@ Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 0
 Chip_Configuration_FeatureCfg_DFS = 0
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
@@ -36,7 +39,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index 8d5203bc..3286aa6c 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/userdebug/gps.cfg
@@ -96,7 +96,12 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
 #Chip_Configuration_IspTestConfig=0x22242822
 
 # Disable BDS in the U.S.
+# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
+#gloUsedInUSPolicy=2
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
@@ -108,9 +113,7 @@ Chip_Configuration_FeatureCfg_DFS = 0
 # APM  = 0x2
 # CP   = 0x4
 # CHUB = 0x8
-# The CHUB on the neus continually triggers a bit so this is to prevent
-# it from continually waking the gnss.
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 
 ### Specify RFIC ID for K42 ###
 # 55400000 = S5540 EVT0
@@ -156,7 +159,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index 02bd4338..80ca3bd7 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/user/gps.cfg
@@ -19,9 +19,12 @@ Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 0
 Chip_Configuration_FeatureCfg_DFS = 0
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
@@ -36,7 +39,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index 8d5203bc..3286aa6c 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/userdebug/gps.cfg
@@ -96,7 +96,12 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
 #Chip_Configuration_IspTestConfig=0x22242822
 
 # Disable BDS in the U.S.
+# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
+#gloUsedInUSPolicy=2
 bdsUsedInUSPolicy=2
+sbasUsedInUSPolicy=2
+qzssUsedInUSPolicy=2
+navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
@@ -108,9 +113,7 @@ Chip_Configuration_FeatureCfg_DFS = 0
 # APM  = 0x2
 # CP   = 0x4
 # CHUB = 0x8
-# The CHUB on the neus continually triggers a bit so this is to prevent
-# it from continually waking the gnss.
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 
 ### Specify RFIC ID for K42 ###
 # 55400000 = S5540 EVT0
@@ -156,7 +159,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=13
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1