diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index f87bdaf..73b071c 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 6358e38..59cf9d6 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 ceffac0..7b4b408 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -171,7 +171,11 @@ SpotLogger_Allowed=0
 RfPathLossDb_Ap=3500
 RfPathLossDb_Cp=3500
 NmeaBitmask=0x010003fff
+
+# force engine to use entire response time for emergency session; default 0
 IsUseEntireRespTime911=1
+# force engine to engage high accuracy if entire response time used; default 0
+isForceHighAccuracyMode=1
 
 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data
 isUseUncalAccel=1
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index c97d6b5..44f70cc 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -64,8 +64,8 @@ RfPathLossDb_Ap=3500
 RfPathLossDb_Cp=3500
 NmeaBitmask=0x010003fff
 IsUseEntireRespTime911=1
+isForceHighAccuracyMode=1
 isUseUncalAccel=1
-
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
 ENABLE_2G_CP_CAPS_MSA=1
@@ -96,35 +96,28 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
-
 GNSS_CARRIER_ID=1
-
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
 ENABLE_4G_CP_CAPS_MSA=0
 ENABLE_NLP_IN_LPPE=0
 ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
-
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 SUPL_SSL_METHOD=TLSv1_2
-
 GNSS_CARRIER_ID=4
-
 GNSS_CARRIER_ID=5
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
-
 GNSS_CARRIER_ID=6
 ENABLE_LPP_CP=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_CP=0
 ENABLE_LPPE_UP=3
-
 GNSS_CARRIER_ID=7
 ENABLE_LPP_CP=0
 ENABLE_LPPE_CP=0
@@ -132,9 +125,7 @@ ENABLE_5G_CP_CAPS_MSA=0
 ENABLE_5G_CP_CAPS_MSB=0
 SUPL_SSL_METHOD=TLSv1
 USE_EMER_PDN_FOR_EMER_SUPL=0
-
 GNSS_CARRIER_ID=8
-
 GNSS_CARRIER_ID=9
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index f792196..bfaa6c1 100644
Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ