diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index df5d8cd..72a1cee 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 dc75b1f..4c2a1f6 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 aee58d7..60f9f6a 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -135,6 +135,7 @@ ChipCfg_DspMemdumpEnable=1
 
 Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
+SETCaps_IsLpp=1
 PosReq_Supl2Params_SuplNiUdpPort=7275
 GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
@@ -178,7 +179,8 @@ ENABLE_LPP_CP=1
 ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=0
-ENABLE_NLP_IN_LPPE=0
+ENABLE_NLP_IN_LPPE=1
+ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 # ATT
 GNSS_CARRIER_ID=1
@@ -186,36 +188,41 @@ GNSS_CARRIER_ID=1
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
 ENABLE_4G_CP_CAPS_MSA=0
-ENABLE_NLP_IN_LPPE=1
+ENABLE_NLP_IN_LPPE=0
+ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 # VZW
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
-# VISIBLE
-GNSS_CARRIER_ID=4
-ENABLE_LPP_UP=1
-ENABLE_LPPE_UP=3
+SUPL_UT2_SEC=10
+SUPL_UT3_SEC=30
 # AIRTEL
-GNSS_CARRIER_ID=5
+GNSS_CARRIER_ID=4
 # RAKUTEN
-GNSS_CARRIER_ID=6
+GNSS_CARRIER_ID=5
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 # KDDI
-GNSS_CARRIER_ID=7
+GNSS_CARRIER_ID=6
 ENABLE_LPP_CP=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_CP=0
 ENABLE_LPPE_UP=3
 # SBM
-GNSS_CARRIER_ID=8
+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
+GNSS_CARRIER_ID=8
+# LAB
+GNSS_CARRIER_ID=9
+ENABLE_LPP_UP=1
+ENABLE_LPPE_UP=3
 GNSS_CARRIER_CONFIG_END
 
 RfPathLossDb_Ap=3.5