diff --git a/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1 b/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1
index 44ad9ff..22b3662 100644
Binary files a/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1 and b/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1 differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 0de92a1..da7574b 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 f0c44e7..0df21dc 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -39,6 +39,33 @@ Chip_Configuration_RefClkControl=0x24
 ### Override for DCXO Cnom/TuneValue
 #Chip_Configuration_DCXOtuneValue=3200
 
+### DCXO Optional Parameters. #####
+#   Can specify Crystal type, and/or over-ride T0-inflection point ####
+#
+# Optionally specify DXCO Crystal type, and operation mode
+# 8 bits.  Lower 4 bits Crystal ID# (0-15)
+#          Upper 4 bits Poly Configuration: (0/1)
+# Poly Configuration: 0: Use CP's poly, 1: Force use of default manufactures polynomial
+### Crystal Types:
+## 0 - Unknown/Default
+## 1 - Kyocera CT1612RB
+## 2 - NDK NX1612SD CS12311
+## 3 - NDK NX1612SD CS13950
+## 4 - NDK NX1612SD CS15298
+## 5 - KDS 7CG07680A10
+## 6-  TXC 0W76870003
+## E.g. Use Kyocera, and ignore CP's polynomial: DCXO_CrystalType=0x11
+## E.g. Use KDS, and Use CP's polynomial: DCXO_CrystalType=0x05
+#Chip_Configuration_DCXO_CrystalType=0x15
+Chip_Configuration_DCXO_CrystalType=0x13
+
+## Optionally specify DXCO Inflection point temperature,        ####
+#    This will override any default value or value in Crystal type ####
+#    Value is degrees C x 100 E.g. 2855 = 28.55 deg C
+#    Range should be 2000 to 3100
+Chip_Configuration_DCXO_InflectionPoint=2450
+
+
 ### 2C48 L1 only MCW ###
 Chip_Configuration_GNSSConstConstraintDef=0x602F
 Chip_Configuration_RfMiscCtrl=0x80008001
@@ -66,10 +93,71 @@ gnss_rfic_chip_id=55200001
 # Uncomment to Disable SUPL (Ignore Android Framework Requests to Enable SUPL)
 #GlueLayer_EnableFwConfiguration=0
 
-#Comment out to disable SGEE
+#Uncomment to disable SGEE
 #Sif_OperationMode=0
 
-# set to 1 for FW SGEE download
+# set to 1 for FW SGEE download - Requires Android FW to be properly configured
 Sif_UseFwXtraInterface=0
 
 ChipCfg_DspMemdumpEnable=1
+
+GNSS_CARRIER_CONFIG_BEGIN
+# DEFAULT
+GNSS_CARRIER_ID=0
+ENABLE_2G_CP_CAPS_MSA=1
+ENABLE_2G_CP_CAPS_MSB=1
+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_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
+SUPL_UT2_SEC=20
+SUPL_UT3_SEC=20
+ENABLE_LPP_CP=1
+ENABLE_LPP_UP=0
+ENABLE_LPPE_CP=3
+ENABLE_LPPE_UP=0
+# ATT
+GNSS_CARRIER_ID=1
+# TMO
+GNSS_CARRIER_ID=2
+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
+ENABLE_LPP_CP=0
+ENABLE_LPP_UP=1
+ENABLE_LPPE_CP=0
+ENABLE_LPPE_UP=3
+# SBM
+GNSS_CARRIER_ID=8
+ENABLE_LPP_CP=0
+ENABLE_LPP_UP=0
+ENABLE_LPPE_CP=0
+ENABLE_LPPE_UP=3
+GNSS_CARRIER_CONFIG_END