diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ccb240c..ff8370d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,7 +29,7 @@
                  android:allowBackup="false"
                  android:label="@string/app_label"
                  android:icon="@mipmap/ic_launcher_phone"
-                 android:usesCleartextTraffic="false">
+                 android:usesCleartextTraffic="true">
 
         <provider android:name="TelephonyProvider"
                   android:authorities="telephony"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 038d1b5..fd621e1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobielnetwerk-opstelling"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Foon-/boodskapsberging"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Foon- en boodskapberging"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 91ede52..115d70e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"የተንቀሳቃሽ ስልክ አውታረመረብ ማዋቀር"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"የስልክ/መልዕክት ማከማቻ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"የስልክ እና የመልዕክት መላላኪያ ማከማቻ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6ac890b..1c53b15 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"تهيئة شبكة الجوال"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"السعة التخزينية للهاتف/المراسلات"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"سعة تخزينية للهاتف والرسائل"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 7a83a42..22cf902 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobil Şəbəkə Konfiqurasiyası"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon/Mesajlaşma Yaddaşı"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon və Mesajlaşma Yaddaşı"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 646d4f1..40b755c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Конфигурация на мобилната мрежа"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Хранилище: тел./съобщ."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Хранил. за тел. и съобщ."</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 04fa2d8..5d6d556 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"মোবাইল নেটওয়ার্ক কনফিগারেশন"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ফোন/বার্তা প্রেরণের সঞ্চয়স্থান"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ফোন এবং বার্তাপ্রেরণের সঞ্চয়স্থান"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 577bdf9..ec43c5c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuració de la xarxa mòbil"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Emmagatz. telèfon/missat."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Emmagatz. telèfon/missat."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c402cbf..3a4e053 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfigurace mobilní sítě"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon a úložiště zpráv"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon a úložiště zpráv"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0586492..abffe9f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfiguration af mobilnetværk"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon- og beskedlager"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon- og beskedlager"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index febd17c..27a576e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfiguration des Mobilfunknetzes"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon-/SMS-Speicher"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon- und SMS-Speicher"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index fd0c903..b2489e8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Ρύθμιση δικτύου κιν. τηλεφωνίας"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Αποθ. τηλ./μηνυμ."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Αποθ. χώρος τηλεφ./μηνυμ."</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 5252756..f11997b 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobile Network Configuration"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Phone/Messaging Storage"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Phone and Messaging Storage"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5252756..f11997b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobile Network Configuration"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Phone/Messaging Storage"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Phone and Messaging Storage"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 5252756..f11997b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobile Network Configuration"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Phone/Messaging Storage"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Phone and Messaging Storage"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6a5ac9a..3460450 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuración de la red móvil"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Teléfono/Almacenamiento de mensajes"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Alm. mensajes y teléfono"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 18515a8..865f254 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuración de red móvil"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Almacenamiento teléfono/mensajes"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Almac. Mensajes/Teléfono"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index d0b4936..4e92634 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobiilsidevõrgu konfigureerimine"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefoni/sõnumite salvestamine"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Kõnede ja sõnumite salv."</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index f763008..ff1af4f 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Sare mugikorraren konfigurazioa"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefono- / Mezu-biltegia"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Operadorea eta mezuak"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 87e5239..c587129 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"پیکربندی شبکهٔ تلفن همراه"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"حافظه تلفن/پیام رسانی"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"فضای ذخیره تلفن و پیام‌رسانی"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 35f6b61..8478884 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Matkapuhelinverkon määritykset"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Puhelimen/viestien tallennustila"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Puhelimen ja viestien tallennustila"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bb9f974..862bb32 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuration du réseau mobile"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Stockage téléphone+SMS/MMS"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Stockage tél. et messages"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bb9f974..6cfcdfb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuration du réseau mobile"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Stockage téléphone+SMS/MMS"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Stockage tél. et SMS/MMS"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 6869a6e..317b3fb 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuración da rede móbil"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Almacenam. tfno./mensaxe"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Almacenamento tel. e mens."</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 6dc1083..c35331d 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"મોબાઇલ નેટવર્ક ગોઠવણી"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ફોન/મેસેજિંગ સંગ્રહ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ફોન/મેસેજિંગ સંગ્રહ"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4eedae0..34bb06b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"मोबाइल नेटवर्क कॉन्फ़िगरेशन"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"फ़ोन/संदेश मेमोरी"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"फ़ोन और संदेश सेवा मेमोरी"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e5a90dc..c65b5ec 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfiguracija mobilne mreže"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Pohrana za telefon/poruke"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Pohrana za telefon/poruke"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0a04a79..f82c03b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobilhálózat konfigurációja"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefonos/üzenet-tárhely"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon- és üzenettár"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 5a29628..b3a5b20 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Բջջային ցանցի կարգավորում"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Հեռախոսի/հաղորդակցման պահոց"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Հեռախոսի և հաղորդակցումների հիշողություն"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c67fa84..129a3da 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfigurasi Jaringan Seluler"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Penyimpanan Ponsel/Pesan"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Penyimpanan Ponsel dan Pesan"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index c0c04fe..b96a7ff 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Grunnstilling farsímakerfis"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Geymsla síma/skilaboða"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Geymsla síma og skilaboða"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5d8d2d0..9802433 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configurazione rete mobile"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Archivio telefono/messaggi"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Memoria telefono/messaggi"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b5aa2bb..6d2ef10 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"תצורת רשת לנייד"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"אחסון טלפון/הודעות"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"טלפון ואחסון הודעות"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ee1a8e5..c9b80f4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"モバイルネットワークの設定"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"電話/SMS用ストレージ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"電話とSMS用ストレージ"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index e26d329..fa84173 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"მობილური ქსელის კონფიგურაცია"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ტელეფონის/შეტყობინებების საცავი"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ტელ. &amp; შეტყობ. მეხსიერება"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 56176f3..a0cb308 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Ұялы Желі Конфигурациясы"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Телефон/Хабар жіберу жады"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Телефон және хабар алмасу қоймасы"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 5ca6f61..c0e65ea 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"ការ​កំណត់​រចនា​សម្ព័ន្ធ​​បណ្ដាញ​​ទូរស័ព្ទ​​ចល័ត"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ឧបករណ៍​ផ្ទុក ទូរស័ព្ទ/ការ​ផ្ញើ​សារ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ឧបករណ៍ផ្ទុកទូរស័ព្ទ និងសារ"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 84a9963..87e43b4 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"ಮೊಬೈಲ್ ನೆಟ್‌‌ವರ್ಕ್‌ ಕಾನ್ಫಿಗರೇಶನ್"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ಫೋನ್‌‌/ಸಂದೇಶಿಸುವಿಕೆ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ಫೋನ್‌‌ ಮತ್ತು ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸಂಗ್ರಹಣೆ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ccd9a51..9e0799b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"모바일 네트워크 구성"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"휴대전화/메시지 저장공간"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"전화 및 메시지 저장소"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
new file mode 100644
index 0000000..4383ad3
--- /dev/null
+++ b/res/values-ky-rKG/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" product="tablet" msgid="9194799012395299737">"Мобилдик тармактын конфигурациясы"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Телфн ж-а SMS/MMS сактгч"</string>
+</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 9929161..80db46b 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"ການຕັ້ງຄ່າເຄືອຂ່າຍມືຖື"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ບ່ອນເກັບຂໍ້ມູນໂທລະສັບ/ຂໍ້ຄວາມ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ບ່ອນເກັບຂໍ້ມູນ​ໃນ​ໂທ​ລະ​ສັບ ແລະ ຂໍ້​ຄວາມ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ee8e7c0..f9091a3 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Tinklo mobiliesiems konfigūracija"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefono / susirašinėjimo saugykla"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telef. ir susir. saugykla"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8518f3c..fc64c44 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobilā tīkla konfigurācija"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Tālr./ziņojumapm. krāt."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Tālruņa un īsziņu krātuve"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 2c1fd15..e1e6246 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Конфигурација на мобилна мрежа"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Меморија на телефон/пораки"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Меморија за телефонот и пораките"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 7da2780..609d40e 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"മൊബൈൽ നെറ്റ്‌വർക്ക് കോൺഫിഗറേഷൻ"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ഫോൺ/സന്ദേശ സ്റ്റോറേജ്"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ഫോൺ, സന്ദേശമയക്കൽ സ്റ്റോറേജ്"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index adab8c5..1c1c927 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Мобайль Сүлжээний Тохируулга"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Утас/Зурвасын Сан"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Гар утас болон Зурвасын Санах ой"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index a354afc..2e2788d 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"मोबाइल नेटवर्क कॉन्‍फिगरेशन"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"फोन/संदेशन संचयन"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"फोन आणि संदेशन संचयन"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 45771ae..fdc24c7 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfigurasi Rangkaian Mudah Alih"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Storan Telefon/Pemesejan"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Storan Telefon &amp; Pemesejn"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index fe6f377..e161f81 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"မိုဘိုင်း ကွန်ရက် အစီအစဉ်"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ဖုန်း/စာပို့ခြင်း သိုလှောင်မှု"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ဖုန်းနှင့် စာပို့ခြင်း သိုလှောင်မှု"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f74bc5d..bb28ae0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfigurasjon av mobilnettverk"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Lagring for telefon/mld."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Lagring for telefon og meldinger"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index bf5b2b6..131d31a 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"मोबाइल नेटवर्क कन्फिगरेसन"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"फोन/सन्देश भण्डारण"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"फोन र सन्देश प्रवाह भण्डारण"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ff7e2c5..041984f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuratie mobiel netwerk"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Opslag voor telefoon/berichten"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Opslag telefoon/berichten"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index e499a0a..2c063bc 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"ਮੋਬਾਈਲ ਨੈਟਵਰਕ ਕੌਂਫਿਗਰੇਸ਼ਨ"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ਫੋਨ/ਮੈਸੇਜ਼ਿੰਗ ਸਟੋਰੇਜ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ਫ਼ੋਨ ਅਤੇ ਮੈਸੇਜ਼ਿਗ ਸਟੋਰੇਜ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9c7c158..29ac057 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfiguracja sieci komórkowej"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon/Pamięć wiadomości"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Pamięć telefonu i SMS-ów"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 35e728a..3ccf200 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuração de rede móvel"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telef./armaz. de mensag."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Tel. e armaz. de mensag."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a581be6..713e580 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuração da rede móvel"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Armazenamento de mensagens/telefone"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Armazenamento de mensagens/smartphone"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a54811d..a2c590c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuraţia reţelei de telefonie mobilă"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Stocare telefon/mesaje"</string>
+    <string name="app_label" product="tablet" msgid="9194799012395299737">"Configurația reţelei de telefonie mobilă"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Stocare Telefon/Mesagerie"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4bd8bc7..78e8670 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Настройки мобильной сети"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Память номеров/SMS/MMS"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Память – звонки и SMS/MMS"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 64d17b9..47ab731 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"ජංගම ජාල වින්‍යාස කිරීම"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"දුරකථන/පණිවිඩ යැවීමේ ආචයනය"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"දුරකථන හා පණිවිඩ ආචයනය"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9b3a34a..65e91df 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfigurácia mobilnej siete"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefón / Ukladací priestor SMS"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefón a úložisko správ"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c2971ea..35892ee 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Nastavitev mobilnega omrežja"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon/pomnilnik za sporočila"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Shramba za telefon in sporočila"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 17cf91d..dc23237 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfigurimi i rrjetit celular"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Hapësira ruajtëse e telefonit/mesazheve"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Hapësira ruajtëse e telefonit dhe mesazheve"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ce1e035..e5cd5b9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Конфигурација мобилне мреже"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Меморија телефона/порука"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Меморија телефона и порука"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 29c7de0..da530b3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Konfiguration av mobilt nätverk"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon-/meddelandelagr."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon-/meddelandelagr."</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 772a496..97319a2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Usanidi wa Mtandao wa Simu"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Simu/Hifadhi ya ujumbe"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Hifadhi ya Simu na Ujumbe"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index febf75f..b280259 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"மொபைல் நெட்வொர்க் உள்ளமைவு"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"மொபைல்/செய்தியிடலுக்கான சேமிப்பிடம்"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"போன் &amp; செய்தி சேமிப்பிடம்"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index cea0749..0bbaa47 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"మొబైల్ నెట్‌వర్క్ కాన్ఫిగరేషన్"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"ఫోన్/సందేశ నిల్వ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ఫోన్ మరియు సందేశ నిల్వ"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index eb804b2..97c6dc0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"การกำหนดค่าเครือข่ายมือถือ"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"โทรศัพท์/ที่เก็บข้อความ"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"ที่จัดเก็บของโทรศัพท์/ข้อความ"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c2e81a7..544721c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Configuration ng Network ng Mobile"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Imbakan ng Telepono/Pagpapadala ng mensahe"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Storage Tel. at Messaging"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5d385a2..164460b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Mobil Ağ Yapılandırması"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Tlf/Mesajlaşma Deplm Brm"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Telefon ve Mesajlaşma Depolama Alanı"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ea0392d..34cf5aa 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Налаштування мобільної мережі"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Пам’ять телеф./повідомл."</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Пам’ять телефона"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index d5d82e4..f1e21c7 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"موبائل نیٹ ورک کنفیگریشن"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"فون/پیغام رسانی اسٹوریج"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"فون اور پیغام رسانی اسٹوریج"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index b006ba8..279bab8 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Uyali tarmoqni moslash"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Telefon/Xabar xotirasi"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Xotira – telefon va SMS/MMS"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 62e2270..9865c8c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Cấu hình mạng điện thoại di động"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Bộ nhớ điện thoại/tin nhắn"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Bộ nhớ đ.thoại+tin nhắn"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 24545e5..f9f5c27 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"移动网络配置"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"电话/短信存储"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"电话和短信存储"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4881e17..fc96850 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"流動網絡設定"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"手機/簡訊儲存裝置"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"手機及短訊儲存服務"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index edb352f..7cbc2c7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"行動網路設定"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"手機/簡訊儲存裝置"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"電話和簡訊儲存服務"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 702e971..e571505 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"Ukucushwa Kohleloxhumano Lweselula"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"Ifoni/Isigcini Somlayezo"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Isitoreji sefoni nokulayeza"</string>
 </resources>
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 67b0645..bf77aec 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -59,6 +59,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class TelephonyProvider extends ContentProvider
 {
@@ -66,7 +67,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 16 << 16;
+    private static final int DATABASE_VERSION = 17 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -91,6 +92,9 @@
     private static final String PREF_FILE = "preferred-apn";
     private static final String COLUMN_APN_ID = "apn_id";
 
+    private static final String PREF_FILE_FULL_APN = "preferred-full-apn";
+    private static final String DB_VERSION_KEY = "version";
+
     private static final String BUILD_ID_FILE = "build-id";
     private static final String RO_BUILD_ID = "ro_build_id";
 
@@ -104,6 +108,29 @@
     private static final ContentValues s_currentNullMap;
     private static final ContentValues s_currentSetMap;
 
+    private static final int INVALID_APN_ID = -1;
+    private static final List<String> CARRIERS_UNIQUE_FIELDS = new ArrayList<String>();
+
+    static {
+        // Columns not included in UNIQUE constraint: name, current, edited, user, server, password,
+        // authtype, type, protocol, roaming_protocol, sub_id, modem_cognitive, max_conns, wait_time,
+        // max_conns_time, mtu, bearer_bitmask, user_visible
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.NUMERIC);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MCC);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MNC);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.APN);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.PROXY);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.PORT);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MMSPROXY);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MMSPORT);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MMSC);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.CARRIER_ENABLED);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.BEARER);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MVNO_TYPE);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.MVNO_MATCH_DATA);
+        CARRIERS_UNIQUE_FIELDS.add(Telephony.Carriers.PROFILE_ID);
+    }
+
     static {
         s_urlMatcher.addURI("telephony", "carriers", URL_TELEPHONY);
         s_urlMatcher.addURI("telephony", "carriers/current", URL_CURRENT);
@@ -265,11 +292,13 @@
                     "max_conns_time INTEGER DEFAULT 0," +
                     "mtu INTEGER DEFAULT 0," +
                     "edited INTEGER DEFAULT " + Telephony.Carriers.UNEDITED + "," +
+                    "user_visible BOOLEAN DEFAULT 1," +
                     // Uniqueness collisions are used to trigger merge code so if a field is listed
                     // here it means we will accept both (user edited + new apn_conf definition)
                     // Columns not included in UNIQUE constraint: name, current, edited,
                     // user, server, password, authtype, type, protocol, roaming_protocol, sub_id,
-                    // modem_cognitive, max_conns, wait_time, max_conns_time, mtu, bearer_bitmask
+                    // modem_cognitive, max_conns, wait_time, max_conns_time, mtu, bearer_bitmask,
+                    // user_visible
                     "UNIQUE (numeric, mcc, mnc, apn, proxy, port, mmsproxy, mmsport, mmsc," +
                     "carrier_enabled, bearer, mvno_type, mvno_match_data, profile_id));");
             if (DBG) log("dbh.createCarriersTable:-");
@@ -504,6 +533,12 @@
                 // copyPreservedApnsToNewTable()
                 // The only exception if upgrading from version 14 is that EDITED field is already
                 // present (but is called USER_EDITED)
+                /*********************************************************************************
+                 * IMPORTANT NOTE: SINCE CARRIERS TABLE IS RECREATED HERE, IT WILL BE THE LATEST
+                 * VERSION AFTER THIS. AS A RESULT ANY SUBSEQUENT UPDATES TO THE TABLE WILL FAIL
+                 * (DUE TO COLUMN-ALREADY-EXISTS KIND OF EXCEPTION). ALL SUBSEQUENT UPDATES SHOULD
+                 * HANDLE THAT GRACEFULLY.
+                 *********************************************************************************/
                 Cursor c;
                 String[] proj = {"_id"};
                 if (VDBG) {
@@ -587,6 +622,27 @@
                 }
                 oldVersion = 16 << 16 | 6;
             }
+            if (oldVersion < (17 << 16 | 6)) {
+                Cursor c = null;
+                try {
+                    c = db.query(CARRIERS_TABLE, null, null, null, null, null, null,
+                            String.valueOf(1));
+                    if (c == null || c.getColumnIndex(Telephony.Carriers.USER_VISIBLE) == -1) {
+                        db.execSQL("ALTER TABLE " + CARRIERS_TABLE + " ADD COLUMN " +
+                                Telephony.Carriers.USER_VISIBLE + " BOOLEAN DEFAULT 1;");
+                    } else {
+                        if (DBG) {
+                            log("onUpgrade skipping " + CARRIERS_TABLE + " upgrade.  Column " +
+                                    Telephony.Carriers.USER_VISIBLE + " already exists.");
+                        }
+                    }
+                } finally {
+                    if (c != null) {
+                        c.close();
+                    }
+                }
+                oldVersion = 17 << 16 | 6;
+            }
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }
@@ -932,8 +988,10 @@
             addIntAttribute(parser, "max_conns_time", map, Telephony.Carriers.MAX_CONNS_TIME);
             addIntAttribute(parser, "mtu", map, Telephony.Carriers.MTU);
 
+
             addBoolAttribute(parser, "carrier_enabled", map, Telephony.Carriers.CARRIER_ENABLED);
             addBoolAttribute(parser, "modem_cognitive", map, Telephony.Carriers.MODEM_COGNITIVE);
+            addBoolAttribute(parser, "user_visible", map, Telephony.Carriers.USER_VISIBLE);
 
             String bearerList = parser.getAttributeValue(null, "bearer_bitmask");
             if (bearerList != null) {
@@ -1366,27 +1424,126 @@
     }
 
     private void setPreferredApnId(Long id, int subId) {
-        SharedPreferences sp = getContext().getSharedPreferences(
-                PREF_FILE, Context.MODE_PRIVATE);
+        SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
-        editor.putLong(COLUMN_APN_ID + subId, id != null ? id.longValue() : -1);
+        editor.putLong(COLUMN_APN_ID + subId, id != null ? id.longValue() : INVALID_APN_ID);
         editor.apply();
+        // remove saved apn if apnId is invalid
+        if (id == null || id.longValue() == INVALID_APN_ID) {
+            deletePreferredApn(subId);
+        }
     }
 
-    private long getPreferredApnId(int subId) {
-        SharedPreferences sp = getContext().getSharedPreferences(
-                PREF_FILE, Context.MODE_PRIVATE);
-        return sp.getLong(COLUMN_APN_ID + subId, -1);
+    private long getPreferredApnId(int subId, boolean checkApnSp) {
+        SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
+        long apnId = sp.getLong(COLUMN_APN_ID + subId, INVALID_APN_ID);
+        if (apnId == INVALID_APN_ID && checkApnSp) {
+            apnId = getPreferredApnIdFromApn(subId);
+            if (apnId != INVALID_APN_ID) {
+                setPreferredApnId(apnId, subId);
+                deletePreferredApn(subId);
+            }
+        }
+        return apnId;
     }
 
     private void deletePreferredApnId() {
-        SharedPreferences sp = getContext().getSharedPreferences(
-                PREF_FILE, Context.MODE_PRIVATE);
+        SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
+        // before deleting, save actual preferred apns (not the ids) in a separate SP
+        Map<String, ?> allPrefApnId = sp.getAll();
+        for (String key : allPrefApnId.keySet()) {
+            // extract subId from key by removing COLUMN_APN_ID
+            try {
+                int subId = Integer.parseInt(key.replace(COLUMN_APN_ID, ""));
+                long apnId = getPreferredApnId(subId, false);
+                if (apnId != INVALID_APN_ID) {
+                    setPreferredApn(apnId, subId);
+                }
+            } catch (Exception e) {
+                loge("Skipping over key " + key + " due to exception " + e);
+            }
+        }
         SharedPreferences.Editor editor = sp.edit();
         editor.clear();
         editor.apply();
     }
 
+    private void setPreferredApn(Long id, int subId) {
+        log("setPreferredApn: _id " + id + " subId " + subId);
+        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        // query all unique fields from id
+        String[] proj = CARRIERS_UNIQUE_FIELDS.toArray(new String[CARRIERS_UNIQUE_FIELDS.size()]);
+        Cursor c = db.query(CARRIERS_TABLE, proj, "_id=" + id, null, null, null, null);
+        if (c != null) {
+            if (c.getCount() == 1) {
+                c.moveToFirst();
+                SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_FULL_APN,
+                        Context.MODE_PRIVATE);
+                SharedPreferences.Editor editor = sp.edit();
+                // store values of all unique fields to SP
+                for (String key : CARRIERS_UNIQUE_FIELDS) {
+                    editor.putString(key + subId, c.getString(c.getColumnIndex(key)));
+                }
+                // also store the version number
+                editor.putString(DB_VERSION_KEY + subId, "" + DATABASE_VERSION);
+                editor.apply();
+            } else {
+                log("setPreferredApn: # matching APNs found " + c.getCount());
+            }
+            c.close();
+        } else {
+            log("setPreferredApn: No matching APN found");
+        }
+    }
+
+    private long getPreferredApnIdFromApn(int subId) {
+        log("getPreferredApnIdFromApn: for subId " + subId);
+        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        String where = TextUtils.join("=? and ", CARRIERS_UNIQUE_FIELDS) + "=?";
+        String[] whereArgs = new String[CARRIERS_UNIQUE_FIELDS.size()];
+        SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_FULL_APN,
+                Context.MODE_PRIVATE);
+        long apnId = INVALID_APN_ID;
+        int i = 0;
+        for (String key : CARRIERS_UNIQUE_FIELDS) {
+            whereArgs[i] = sp.getString(key + subId, null);
+            if (whereArgs[i] == null) {
+                return INVALID_APN_ID;
+            }
+            i++;
+        }
+        Cursor c = db.query(CARRIERS_TABLE, new String[]{"_id"}, where, whereArgs, null, null, null);
+        if (c != null) {
+            if (c.getCount() == 1) {
+                c.moveToFirst();
+                apnId = c.getInt(c.getColumnIndex("_id"));
+            } else {
+                log("getPreferredApnIdFromApn: returning INVALID. # matching APNs found " +
+                        c.getCount());
+            }
+            c.close();
+        } else {
+            log("getPreferredApnIdFromApn: returning INVALID. No matching APN found");
+        }
+        return apnId;
+    }
+
+    private void deletePreferredApn(int subId) {
+        log("deletePreferredApn: for subId " + subId);
+        SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_FULL_APN,
+                Context.MODE_PRIVATE);
+        if (sp.contains(DB_VERSION_KEY + subId)) {
+            log("deletePreferredApn: apn is stored. Deleting it now for subId " + subId);
+            SharedPreferences.Editor editor = sp.edit();
+            editor.remove(DB_VERSION_KEY + subId);
+            for (String key : CARRIERS_UNIQUE_FIELDS) {
+                editor.remove(key + subId);
+            }
+            editor.remove(DB_VERSION_KEY + subId);
+            editor.apply();
+        }
+    }
+
     @Override
     public synchronized Cursor query(Uri url, String[] projectionIn, String selection,
             String[] selectionArgs, String sort) {
@@ -1460,7 +1617,7 @@
             //intentional fall through from above case
             case URL_PREFERAPN:
             case URL_PREFERAPN_NO_UPDATE: {
-                qb.appendWhere("_id = " + getPreferredApnId(subId));
+                qb.appendWhere("_id = " + getPreferredApnId(subId, true));
                 break;
             }