merge in lmp-release history after reset to 0d5d76cd2ee9558b451c6adb67510f6a627c6824
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index 902526e..ed023ce 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -1,7 +1,7 @@
 ###############################################################################
 # Application options
-APPL_TRACE_LEVEL=0xFF
-PROTOCOL_TRACE_LEVEL=0xFFFFFFFF
+APPL_TRACE_LEVEL=0x01
+PROTOCOL_TRACE_LEVEL=0x00000000
 
 ###############################################################################
 # performance measurement
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml
index d65314a..d9c1a5a 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml
@@ -28,9 +28,21 @@
 
     <!-- Values for GPS configuration (Verizon) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>LPP_PROFILE=3</item>
         <item>GPS_LOCK=3</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 
     <string-array translatable="false" name="config_default_vm_number">
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
index 5f4f4cf..a3a6c0d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
@@ -26,9 +26,21 @@
 
     <!-- Values for GPS configuration (Sprint) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 
     <!-- The VoiceMail default value is displayed to my own number if it is true -->
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
index 59a35fd..1b770b8 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
@@ -37,6 +37,7 @@
         <item>GPS_LOCK=1</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=1</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 
 
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
index 159b35b..b07a554 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
@@ -37,10 +37,21 @@
 
     <!-- Values for GPS configuration (AT&T) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=NONE</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=1</item>
         <item>LPP_PROFILE=3</item>
-        <item>SUPL_HOST=NONE</item>
         <item>SUPL_MODE=1</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 
     <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 this is the Values
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc225/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml
index ffa6541..f4ab085 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml
@@ -28,9 +28,21 @@
 
     <!-- Values for GPS configuration (Verizon) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=3</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 
     <string-array translatable="false" name="config_default_vm_number">
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
index c6cd038..ce6b947 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
@@ -28,8 +28,20 @@
 
     <!-- Values for GPS configuration (US Cellular) -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>NMEA_PROVIDER=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        <item>ERR_ESTIMATE=0</item>
+        <item>INTERMEDIATE_POS=0</item>
         <item>GPS_LOCK=3</item>
         <item>LPP_PROFILE=2</item>
         <item>SUPL_MODE=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 23cf2d4..48f3e86 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -313,5 +313,6 @@
         <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
         <item>ERR_ESTIMATE=0</item>
         <item>INTERMEDIATE_POS=0</item>
+        <item>SUPL_ES=0</item>
     </string-array>
 </resources>