diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 5d95a6b..4790fd7 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 329b190..88fe6d7 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 3d2b029..99b9fa0 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -73,7 +73,11 @@ Chip_Configuration_DCXO_CrystalType=0x11
 
 # disable spam dog to avoid loss of position request
 spam_dog_ms=0
+# disable HW watchdog
+Chip_Configuration_WatchdogPeriod = 0
 
+# GPS= 0x0001 GLO= 0x0002 GALILEO=0x0004 BEIDOU=0x0008 SBAS=0x0010 QZSS=0x0020
+# MEMS Static Detect=0x4000 MEMS Heading=0x2000
 ### 2C48 L1 only MCW ###
 Chip_Configuration_GNSSConstConstraintDef=0x603F
 Chip_Configuration_RfMiscCtrl=0x80008001
@@ -133,12 +137,16 @@ ENABLE_3G_CP_CAPS_MSA=1
 ENABLE_3G_CP_CAPS_MSB=1
 ENABLE_4G_CP_CAPS_MSA=1
 ENABLE_4G_CP_CAPS_MSB=1
+ENABLE_5G_CP_CAPS_MSA=1
+ENABLE_5G_CP_CAPS_MSB=1
 ENABLE_2G_UP_CAPS_MSA=1
 ENABLE_2G_UP_CAPS_MSB=1
 ENABLE_3G_UP_CAPS_MSA=1
 ENABLE_3G_UP_CAPS_MSB=1
 ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
+ENABLE_5G_UP_CAPS_MSA=0
+ENABLE_5G_UP_CAPS_MSB=0
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
 ENABLE_LPP_CP=1
@@ -153,23 +161,17 @@ ENABLE_3G_CP_CAPS_MSA=0
 ENABLE_4G_CP_CAPS_MSA=0
 # VZW
 GNSS_CARRIER_ID=3
-ENABLE_LPP_CP=1
 ENABLE_LPP_UP=1
-ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=3
 # VISIBLE
 GNSS_CARRIER_ID=4
-ENABLE_LPP_CP=1
 ENABLE_LPP_UP=1
-ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=3
 # AIRTEL
 GNSS_CARRIER_ID=5
 # RAKUTEN
 GNSS_CARRIER_ID=6
-ENABLE_LPP_CP=1
 ENABLE_LPP_UP=1
-ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=3
 # KDDI
 GNSS_CARRIER_ID=7
@@ -182,7 +184,9 @@ GNSS_CARRIER_ID=8
 ENABLE_LPP_CP=0
 ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=0
-ENABLE_LPPE_UP=3
+ENABLE_LPPE_UP=0
+ENABLE_5G_CP_CAPS_MSA=0
+ENABLE_5G_CP_CAPS_MSB=0
 GNSS_CARRIER_CONFIG_END
 
 bdsUsedInUSPolicy=2
@@ -195,3 +199,8 @@ GlueLayer_MeasCorrCap=7
 
 RfPathLossDb_Ap=3.5
 RfPathLossDb_Cp=3.5
+
+Agnss_SuplUseCpNi=1
+PosReq_Supl2Params_SuplNiUdpPort=7275
+
+NmeaBitmask=0x010003fff