Restoring XTRA GPS assistance

Pointing the base config.xml to XTRA v3
and removing the redundant overlays

Bug: 36356863
Test: Fast GPS fix after delete all on Angler.
Change-Id: I513d43e705b392ae84bcdbda00b0be3fac93cad0
(cherry picked from commit 86aa27a06530aae65e57522832118a2524412025)
diff --git a/overlay/frameworks/base/core/res/res/values-mcc202-mnc05/config.xml b/overlay/frameworks/base/core/res/res/values-mcc202-mnc05/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc202-mnc05/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc202-mnc05/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc204-mnc04/config.xml b/overlay/frameworks/base/core/res/res/values-mcc204-mnc04/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc204-mnc04/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc204-mnc04/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc206-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc206-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc206-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc206-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc216-mnc70/config.xml b/overlay/frameworks/base/core/res/res/values-mcc216-mnc70/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc216-mnc70/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc216-mnc70/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc219-mnc10/config.xml b/overlay/frameworks/base/core/res/res/values-mcc219-mnc10/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc219-mnc10/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc219-mnc10/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc222-mnc10/config.xml b/overlay/frameworks/base/core/res/res/values-mcc222-mnc10/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc222-mnc10/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc222-mnc10/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc226-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc226-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc226-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc226-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc228-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc228-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc228-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc228-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc230-mnc03/config.xml b/overlay/frameworks/base/core/res/res/values-mcc230-mnc03/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc230-mnc03/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc230-mnc03/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc232-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc232-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc232-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc232-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc234-mnc15/config.xml b/overlay/frameworks/base/core/res/res/values-mcc234-mnc15/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc234-mnc15/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc234-mnc15/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc262-mnc02/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc262-mnc02/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc262-mnc02/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc272-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc272-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc272-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc272-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc276-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc276-mnc02/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc276-mnc02/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc276-mnc02/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc284-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc284-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc284-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc284-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc286-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc286-mnc02/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc286-mnc02/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc286-mnc02/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml
index 25d8630..9ead607 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=http://supl.telusmobility.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc221/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc221/config.xml
index aa4e680..ada91cd 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc221/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc221/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=http://supl.telusmobility.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc370/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc370/config.xml
index 56d7bec..7787e15 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc370/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc370/config.xml
@@ -21,9 +21,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc660/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc660/config.xml
index 56d7bec..7787e15 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc660/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc660/config.xml
@@ -21,9 +21,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml
index 56d7bec..7787e15 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml
@@ -21,9 +21,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc000/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc000/config.xml
index 2096304..ffc2f67 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc000/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc000/config.xml
@@ -21,9 +21,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
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 2096304..ffc2f67 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml
@@ -21,9 +21,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc070/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc070/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc070/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc070/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
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 845b42a..9ad99e4 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
@@ -28,9 +28,6 @@
     <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_MODE=0</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc160/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc160/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc160/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc160/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc170/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc170/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc170/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc170/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc200/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc200/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc200/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc200/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc210/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc210/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc210/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc210/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc220/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc220/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc220/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc220/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc230/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc230/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc230/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc230/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc240/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc240/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc240/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc240/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc250/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc250/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc250/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc250/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
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 036addd..7aff29e 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc270/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc270/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc270/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc270/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc300/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc300/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc300/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc300/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc310/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc310/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc310/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc310/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
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 cf653f2..b066794 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc490/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc490/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc490/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc490/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc530/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc530/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc530/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc530/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc580/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc580/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc580/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc580/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc590/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc590/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc590/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc590/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc640/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc640/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc640/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc640/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc660/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc660/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc660/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc660/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc800/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc800/config.xml
index 47f0c62..7b2e167 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc800/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc800/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=lbs.geo.t-mobile.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc180/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc180/config.xml
index 9a2b7c9..43d658d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc180/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc180/config.xml
@@ -28,9 +28,6 @@
     <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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
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 6d7dce6..f7931a1 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml
@@ -22,9 +22,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml b/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml
index 65f8453..e939de8 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml
@@ -33,9 +33,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc450-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc450-mnc02/config.xml
index 32009c7..2c51882 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc450-mnc02/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc450-mnc02/config.xml
@@ -24,9 +24,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc450-mnc05/config.xml b/overlay/frameworks/base/core/res/res/values-mcc450-mnc05/config.xml
index 9893d5e..8c04a67 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc450-mnc05/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc450-mnc05/config.xml
@@ -24,9 +24,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=wpde.nate.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc450-mnc06/config.xml b/overlay/frameworks/base/core/res/res/values-mcc450-mnc06/config.xml
index 8438f34..2f598c2 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc450-mnc06/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc450-mnc06/config.xml
@@ -24,9 +24,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc450-mnc08/config.xml b/overlay/frameworks/base/core/res/res/values-mcc450-mnc08/config.xml
index 32009c7..2c51882 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc450-mnc08/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc450-mnc08/config.xml
@@ -24,9 +24,6 @@
     <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_MODE=1</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc450-mnc11/config.xml b/overlay/frameworks/base/core/res/res/values-mcc450-mnc11/config.xml
index cc8b714..4a931b9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc450-mnc11/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc450-mnc11/config.xml
@@ -24,9 +24,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=wpde.nate.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc505-mnc03/config.xml b/overlay/frameworks/base/core/res/res/values-mcc505-mnc03/config.xml
index 9858dff..f036a5f 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc505-mnc03/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc505-mnc03/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc655-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc655-mnc01/config.xml
index 732ac3c..bc45ff9 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc655-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc655-mnc01/config.xml
@@ -21,9 +21,6 @@
     <string-array translatable="false" name="config_gpsParameters">
         <item>SUPL_HOST=supl.vodafone.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_MODE=3</item>
         <item>SUPL_VER=0x20000</item>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f994a49..0503379 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -351,9 +351,9 @@
     <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>XTRA_SERVER_1=https://xtrapath1.izatcloud.net/xtra3grc.bin</item>
+        <item>XTRA_SERVER_2=https://xtrapath2.izatcloud.net/xtra3grc.bin</item>
+        <item>XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra3grc.bin</item>
         <item>NTP_SERVER=north-america.pool.ntp.org</item>
         <item>SUPL_MODE=1</item>
         <item>SUPL_VER=0x20000</item>