diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index e11d63f..d63a471 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 d48e1de..7092b2e 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 b72137f..6a5cf0a 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -158,6 +158,7 @@ SpotLogger_Allowed=0
 RfPathLossDb_Ap=3.5
 RfPathLossDb_Cp=3.5
 NmeaBitmask=0x010003fff
+IsUseEntireRespTime911=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
@@ -237,4 +238,3 @@ GNSS_CARRIER_CONFIG_END
 # TODO - should remove after NFW implementation done
 GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_IsUseNfwVCLocAccess=0
-IsUseEntireRespTime911=1
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 232badb..1555997 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -154,6 +154,7 @@ SpotLogger_Allowed=0
 RfPathLossDb_Ap=3.5
 RfPathLossDb_Cp=3.5
 NmeaBitmask=0x010003fff
+IsUseEntireRespTime911=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
@@ -233,4 +234,3 @@ GNSS_CARRIER_CONFIG_END
 # TODO - should remove after NFW implementation done
 GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_IsUseNfwVCLocAccess=0
-IsUseEntireRespTime911=1