diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 585b158..1269801 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 a79e198..3ee10e2 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 c317a00..b4c749f 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -1,7 +1,7 @@
 ############################################
 GlueLayer_ToolConfigSelection=3
 debug_console=1
-debug_enable=1
+debug_enable=4
 mem_dump_to_node=1
 force_instant_logging=0
 user_ports_tcp_name=Autotest
@@ -167,6 +167,9 @@ RfPathLossDb_Cp=3500
 NmeaBitmask=0x010003fff
 IsUseEntireRespTime911=1
 
+# 0: Use calibrated Accel data 1: Use uncalibrated Accel data
+isUseUncalAccel=1
+
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
@@ -241,7 +244,3 @@ GNSS_CARRIER_ID=9
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 GNSS_CARRIER_CONFIG_END
-
-# 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 d557b2d..ab16105 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -18,6 +18,7 @@ scheduling_enabled=1
 Chip_Configuration_AidingConfiguration=0x00020046
 Chip_Configuration_RefClkControl=0x24
 Chip_Configuration_DCXO_CrystalType=0x11
+spam_dog_ms=0
 Chip_Configuration_WatchdogPeriod = 0
 Chip_Configuration_GNSSConstConstraintDef=0x602F
 Chip_Configuration_RfMiscCtrl=0x80008001
@@ -59,8 +60,9 @@ RfPathLossDb_Ap=3500
 RfPathLossDb_Cp=3500
 NmeaBitmask=0x010003fff
 IsUseEntireRespTime911=1
-GNSS_CARRIER_CONFIG_BEGIN
+isUseUncalAccel=1
 
+GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
@@ -133,6 +135,3 @@ GNSS_CARRIER_ID=9
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 GNSS_CARRIER_CONFIG_END
-
-GlueLayer_IsUseNfwLocAccess=0
-GlueLayer_IsUseNfwVCLocAccess=0
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index 0b9f544..f673c29 100644
Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ