diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 3931031..e11d63f 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 ff6f14e..d48e1de 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 7fb12de..b72137f 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -237,3 +237,4 @@ 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 5a9240f..232badb 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -233,3 +233,4 @@ GNSS_CARRIER_CONFIG_END
 # TODO - should remove after NFW implementation done
 GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_IsUseNfwVCLocAccess=0
+IsUseEntireRespTime911=1