diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 72a1cee..ef5c720 100644
Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 4c2a1f6..d2e553f 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 991f40d..87c5938 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -91,7 +91,6 @@ navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled (default), 1 = Enabled
 # DFS: 0 = Disabled (default), 1 = Enabled
-# JJM: disabling due to suspicion that DVFS is contributing to GAL BAD ISM
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 
@@ -136,6 +135,7 @@ Chip_Configuration_FeatureCfg_ACT = 5
 ChipCfg_DspMemdumpEnable=1
 
 Agnss_IsGloAidingEnable=0
+Agnss_SuplUseCpNi=1
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 PosReq_Supl2Params_SuplNiUdpPort=7275
@@ -156,6 +156,10 @@ UP_LocTech_Constraints=1
 UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
 
+RfPathLossDb_Ap=3.5
+RfPathLossDb_Cp=3.5
+NmeaBitmask=0x010003fff
+
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
@@ -214,9 +218,7 @@ ENABLE_LPPE_UP=3
 # SBM
 GNSS_CARRIER_ID=7
 ENABLE_LPP_CP=0
-ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=0
-ENABLE_LPPE_UP=0
 ENABLE_5G_CP_CAPS_MSA=0
 ENABLE_5G_CP_CAPS_MSB=0
 # DOCOMO
@@ -227,11 +229,6 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 GNSS_CARRIER_CONFIG_END
 
-RfPathLossDb_Ap=3.5
-RfPathLossDb_Cp=3.5
-Agnss_SuplUseCpNi=1
-NmeaBitmask=0x010003fff
-
 # TODO - should remove after NFW implementation done
 GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_IsUseNfwVCLocAccess=0
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 3445595..a200081 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -87,7 +87,6 @@ navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled (default), 1 = Enabled
 # DFS: 0 = Disabled (default), 1 = Enabled
-# JJM: disabling due to suspicion that DVFS is contributing to GAL BAD ISM
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 
@@ -132,6 +131,7 @@ Chip_Configuration_FeatureCfg_ACT = 5
 ChipCfg_DspMemdumpEnable=1
 
 Agnss_IsGloAidingEnable=0
+Agnss_SuplUseCpNi=1
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 PosReq_Supl2Params_SuplNiUdpPort=7275
@@ -152,6 +152,10 @@ UP_LocTech_Constraints=1
 UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
 
+RfPathLossDb_Ap=3.5
+RfPathLossDb_Cp=3.5
+NmeaBitmask=0x010003fff
+
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
@@ -210,9 +214,7 @@ ENABLE_LPPE_UP=3
 # SBM
 GNSS_CARRIER_ID=7
 ENABLE_LPP_CP=0
-ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=0
-ENABLE_LPPE_UP=0
 ENABLE_5G_CP_CAPS_MSA=0
 ENABLE_5G_CP_CAPS_MSB=0
 # DOCOMO
@@ -223,11 +225,6 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 GNSS_CARRIER_CONFIG_END
 
-RfPathLossDb_Ap=3.5
-RfPathLossDb_Cp=3.5
-Agnss_SuplUseCpNi=1
-NmeaBitmask=0x010003fff
-
 # TODO - should remove after NFW implementation done
 GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_IsUseNfwVCLocAccess=0