diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 743f67c..30155d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -188,7 +188,7 @@
 
         <receiver android:name="PhoneAccountBroadcastReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3b13384..7decddd 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Vinnige antwoord"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Stel verstek program terug"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Boodskap gestuur na <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Foonrekeninginstellings"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Verstek uitgaande rekening"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi-oproeprekening"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Vra elke keer"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Moenie Wi-Fi vir oproepe gebruik nie"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Hierdie gebruiker word nie toegelaat om nienood-foonoproepe te maak nie"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Oproep nie gestuur nie; geen geldige nommer is ingevoer nie."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Vermiste stemboodskapnommer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9933742..d44f01b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ፈጣን ምላሽ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ነባሪውን መተግበሪያ ዳግም አስጀምር"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ለ <xliff:g id="PHONE_NUMBER">%s</xliff:g> የተላከ መልዕክት"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"የስልክ መለያ ቅንብሮች"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ነባር ወጪ መለያ"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"የWi-Fi መደወያ መለያ"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ሁልጊዜ ጊዜ ጠይቅ"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"የWi-Fi ጥሪ አይጠቀሙ"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ይህ ተጠቃሚ የአስቸኳይ አደጋ ያልሆኑ ስልክ ጥሪዎችን እንዲያደርጉ አልተፈቀደላቸውም"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ጥሪ አልተላከም፣ ትክክለኛ ቁጥር አልገባም።"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"የድምፅመልዕክት ቁጥርአመለጠ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 70f222c..a30f1e6 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"رد سريع"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"إعادة تعيين التطبيق الافتراضي"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"تم إرسال الرسالة إلى <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"إعدادات حساب الهاتف"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"الحساب الافتراضي للصادر"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"‏حساب الاتصال عبر Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"الطلب في كل مرة"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏عدم استخدام الاتصال عبر Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"هذا المستخدم غير مسموح له بإجراء مكالمات هاتفية بخلاف مكالمات الطوارئ"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"لم يتم إرسال الاتصال، لم يتم إدخال رقم صالح."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"رقم البريد الصوتي مفقود"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 98ed67c..d3c0d96 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Бърз отговор"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Възст. на станд. настройки"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"До <xliff:g id="PHONE_NUMBER">%s</xliff:g> бе изпратено съобщение."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Настройки на профила за телефона"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Стандартен профил за изходящи обаждания"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Профил за обаждане през Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Извеждане на запитване всеки път"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Без използване на обаждане през Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"На този потребител е разрешено да провежда само спешни обаждания"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Обаждането не е изпратено, не е въведен валиден номер."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Липсващ номер на гласова поща"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 20a58ad..f48f280 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"দ্রুত প্রতিক্রিয়া"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ডিফল্ট অ্যাপ্লিকেশন পুনরায় সেট করুন"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> এ বার্তা পাঠানো হয়েছে৷"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ফোন অ্যাকাউন্ট সেটিংস"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"আউটগোয়িং ডিফল্ট অ্যাকাউন্ট"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi এর মাধ্যমে কল করার অ্যাকাউন্ট"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"প্রতিবার জিজ্ঞাসা করুন"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi কলিং ব্যবহার করবেন না"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"জরুরী নয় এমন ফোন কল করার জন্য ব্যবহারকারী অনুমতি পাননি"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"কল করা যায়নি, কোনো বৈধ নম্বর লেখা হয়নি।"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ভয়েসমেল নম্বর অনুপস্থিত"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3ea01f0..e7011f5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta ràpida"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restableix aplic. predetermin."</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Missatge enviat a <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configuració del compte del telèfon"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Compte de sortida predeterminat"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Compte per a les trucades mitjançant Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Pregunta sempre"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"No facis servir les trucades mitjançant Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Aquest usuari no pot fer trucades que no siguin d\'emergència."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"No s\'ha enviat la trucada perquè no s\'ha introduït cap número vàlid."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta el número de correu de veu"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 996f241..db612a4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Rychlá odpověď"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Resetovat výchozí aplikaci"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Zpráva byla odeslána na číslo <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Nastavení telefonního účtu"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Výchozí odchozí účet"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Účet k volání pomocí Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Vždy se dotázat"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nepoužívat volání pomocí Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Uživatel smí uskutečňovat pouze tísňová volání."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Hovor nelze spojit, nebylo zadáno platné číslo."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Chybí číslo hlasové schránky"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d329ec3..e7ba06f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hurtigt svar"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Nulstil standardapp"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelelsen er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Kontoindstillinger for telefon"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standardkonto for udgående"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto til Wi-Fi-opkald"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Spørg hver gang"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Brug ikke Wi-Fi-opkald"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Denne bruger har kun tilladelse til at foretage nødopkald"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Opkaldet kunne ikke sendes. Der blev ikke indtastet et gyldigt nummer."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Telefonsvarernummer mangler"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f31124d..9a5ee71 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Kurzantwort"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Standard-App zurücksetzen"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Nachricht an <xliff:g id="PHONE_NUMBER">%s</xliff:g> gesendet"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefonkontoeinstellungen"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standardkonto für ausgehende Anrufe"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto für WLAN-Anrufe"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Jedes Mal fragen"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Keine WLAN-Anrufe nutzen"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Dieser Nutzer darf abgesehen von Notrufen keine Anrufe tätigen."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Anruf nicht verbunden; keine gültige Nummer eingegeben."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Fehlende Mailbox-Nummer"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6283f37..7bea2ac 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Γρήγορη απάντηση"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Επαναφορά προεπιλ. εφαρμογής"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Το μήνυμα εστάλη στο <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Ρυθμίσεις λογαριασμού τηλεφώνου"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Προεπιλεγμένος εξερχόμενος λογαριασμός"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Λογαριασμός κλήσης μέσω Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Ερώτηση κάθε φορά"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Να μη χρησιμοποιείται η κλήση μέσω Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Δεν επιτρέπεται σε αυτόν το χρήστη να πραγματοποιεί τηλεφωνικές κλήσεις οι οποίες δεν είναι εκτάκτου ανάγκης"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Η κλήση δεν πραγματοποιήθηκε, δεν έγινε εισαγωγή έγκυρου αριθμού."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Λείπει ο αριθμός αυτόματου τηλεφωνητή"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8ecf761..97cc163 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Quick response"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Reset default app"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message sent to <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Phone account settings"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Default outgoing account"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi calling account"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Ask every time"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Do not use Wi-Fi calling"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"This user is not allowed to make non-emergency phone calls"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Call not sent. No valid number entered."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Missing voicemail number"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8ecf761..97cc163 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Quick response"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Reset default app"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message sent to <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Phone account settings"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Default outgoing account"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi calling account"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Ask every time"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Do not use Wi-Fi calling"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"This user is not allowed to make non-emergency phone calls"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Call not sent. No valid number entered."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Missing voicemail number"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e31d1a2..85ee3fd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Respuesta rápida"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restablecer aplic. predeterm."</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaje enviado a <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configuración de cuenta telefónica"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Cuenta saliente predeterminada"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Cuenta para llamadas por Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Preguntar siempre"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"No utilizar llamadas por Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuario solo tiene permisos para hacer llamadas de emergencia."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Llamada no enviada. No se ingresó un número válido."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta el número de correo de voz"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c17fdf2..83743fb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Respuestas rápidas"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restablecer aplicación"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaje enviado a <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Ajustes de cuenta del teléfono"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Cuenta predeterminada para hacer llamadas"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Cuenta para llamadas Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Preguntar siempre"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"No usar llamadas Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuario solo puede realizar llamadas de emergencia"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"No se ha enviado la llamada; el número introducido no es válido."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta el número del buzón de voz."</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 20e1aaa..3ce3075 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Kiirvastus"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Lähtesta vaikerakendus"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Sõnum on saadetud numbrile <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefoni konto seaded"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Väljuvate kõnede vaikekonto"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"WiFi-kõnede konto"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Küsi iga kord"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ära kasuta WiFi-kõnesid"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"See kasutaja võib teha ainult hädaabikõnesid"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Kõnet ei tehtud, sisestati kehtetu number."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Puudub kõnepostinumber"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 0a44223..d1f644e 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Erantzun bizkorra"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Berrezarri aplik. lehenetsia"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mezua bidali da <xliff:g id="PHONE_NUMBER">%s</xliff:g> zenbakira."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefonoko kontuaren ezarpenak"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Irteerako kontu lehenetsia"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi bidezko deiak egiteko kontua"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Galdetu beti"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ez erabili Wi-Fi bidezko deiak"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Erabiltzaile honek ez du larrialdietakoak ez diren telefono-deiak egiteko baimenik"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Ez da deia egin ez delako baliozko zenbakirik idatzi."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Erantzungailuaren zenbakia falta da"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8078fa4..a54b374 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"پاسخ سریع"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"بازنشانی برنامه‌ پیش‌فرض"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"پیام به <xliff:g id="PHONE_NUMBER">%s</xliff:g> ارسال شد."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"تنظیمات حساب تلفن"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"حساب خروجی پیش‌فرض"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"‏حساب برقراری تماس تلفنی با Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"هر بار پرسیده شود"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏از تماس تلفنی با Wi-Fi استفاده نشود"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"این کاربر اجازه برقراری تماس‌های تلفنی غیر اضطراری ندارد."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"تماس ارسال نشد، هیچ شماره معتبری وارد نشده است."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"عدم وجود شماره پست صوتی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b7713bb..eab9a8b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Pikavastaukset"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Palauta oletussovellus"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Viesti lähetetty numeroon <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Puhelintilin asetukset"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Lähtevien puheluiden oletustili"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi-puhelutili"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Kysy aina"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Älä käytä puheluihin Wi-Fiä"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Tämä käyttäjä saa soittaa vain hätäpuheluita"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Puhelua ei soitettu, et antanut kelvollista numeroa."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Puhelinvastaajan numero puuttuu"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f7935d6..63bd398 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Réponse rapide"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Rétablir application par défaut"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message envoyé à <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Paramètres du compte de téléphone"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Compte sortant par défaut"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Compte pour les appels Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Toujours demander"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne pas utiliser les appels par Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Cet utilisateur n\'est pas autorisé à faire des appels téléphoniques non urgents"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"L\'appel n\'a pas été effectué, car le numéro entré n\'est pas valide."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Numéro de messagerie vocale manquant"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9bea305..2fb06f6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Réponse rapide"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Rétablir application par défaut"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message envoyé à <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Paramètres de compte du téléphone"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Compte par défaut pour appels sortants"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Compte pour les appels Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Toujours demander"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne pas utiliser les appels Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Cet utilisateur n\'est autorisé à effectuer que des appels d\'urgence."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"L\'appel n\'a pas été effectué. Aucun numéro valide n\'a été saisi."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Numéro de messagerie vocale manquant"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 66f4ac4..d7bde86 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta rápida"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restablecer aplicación predet."</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaxe enviada ao <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configuración da conta do teléfono"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Conta saínte predeterminada"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Conta de chamadas wifi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Preguntar sempre"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Non utilizar as chamadas wifi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuario non ten permiso para facer chamadas telefónicas que non sexan de emerxencia"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Chamada non enviada; o número introducido non é válido."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta o número de correo de voz"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ee242e3..debd49b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"त्वरित प्रतिसाद"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"डिफ़ॉल्ट ऐप्स  रीसेट करें"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> को संदेश भेजा गया."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"फ़ोन खाता सेटिंग"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"डिफ़ॉल्ट आउटगोइंग खाता"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"वाई-फ़ाई  कॉलिंग खाता"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"हर बार पूछें"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"वाई-फ़ाई  कॉलिंग का उपयोग न करें"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"इस उपयोगकर्ता को गैर-आपातकालीन फ़ोन कॉल करने की अनुमति नहीं है"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"कॉल नहीं भेजा गया, कोई मान्य नंबर नहीं डाला गया था."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"गुम ध्वनिमेल नंबर"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index adf4033..f86f4a9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Brzi odgovor"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Poništavanje zadane aplikacije"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Poruka poslana na broj <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Postavke telefonskog računa"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Zadani odlazni račun"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Račun za Wi-Fi pozive"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Pitaj svaki put"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne upotrebljavaj Wi-Fi pozive"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ovaj korisnik smije uspostavljati samo hitne pozive"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Poziv nije uspostavljen, nije unesen važeći broj."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nedostaje broj govorne pošte"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 136bb7e..cc7c77a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Gyors válasz"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Alapalkalmazás visszaállítása"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Üzenet elküldve ide: <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefonos fiókbeállítások"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Alapértelmezett kimenő fiók"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"A Wi-Fi-híváshoz használt fiók"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Mindig rákérdez"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne használja a Wi-Fi-hívást"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ez a felhasználó csak vészhelyzeti telefonhívásokat kezdeményezhet"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"A hívás indítása érvénytelen szám beírása miatt nem történt meg."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Hiányzik a hangposta száma"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 68eb9c4..8f47792 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Արագ պատասխան"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Վերականգնել լռելյայն հավելվածը"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Հաղորդագրությունն ուղարկվել է <xliff:g id="PHONE_NUMBER">%s</xliff:g>-ին:"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Հեռախոսի հաշիվների կարգավորումներ"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Կանխադրված ելքային հաշիվը"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi զանգերի հաշիվ"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Հարցնել ամեն անգամ"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Չօգտագործել Wi-Fi զանգերը"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Այս օգտվողին չի թույլատրվում կատարել ոչ արտակարգ զանգեր"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Զանգը չի կատարվել, անվավեր համար է մուտքագրված:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Բացակայում է ձայնային փոստի համարը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6f35ca1..755eb9d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tanggapan cepat"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Setel ulang aplikasi default"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Pesan dikirim ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Setelan akun ponsel"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Akun keluar default"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Akun panggilan Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Tanyakan setiap kali"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Jangan gunakan panggilan Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Pengguna ini tidak diizinkan untuk membuat panggilan telepon non-darurat"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Panggilan tidak terkirim, tidak ada nomor valid yang dimasukkan."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nomor kotak pesan hilang"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 7346c6f..4a7fb77 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Snarsvar"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Endurstilla sjálfgefið forrit"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Skilaboð send til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Reikningsstillingar síma"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Sjálfgefinn sendingarreikningur"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Reikningur Wi-Fi símtala"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Spyrja í hvert skipti"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ekki nota Wi-Fi símtöl"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Þessi notandi hefur ekki leyfi til að hringja símtöl önnur en neyðarsímtöl"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Símtalið var ekki sent. Ekki var slegið inn gilt símanúmer."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Talhólfsnúmer vantar"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 045fc49..ead17ae 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Risposta rapida"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Reimposta app predefinita"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Messaggio inviato a <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Impostazioni account telefono"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Account di uscita predefinito"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Account per chiamate Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Chiedi ogni volta"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Non utilizzare chiamate Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Questo utente non è autorizzato a fare telefonate diverse da quelle di emergenza"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Chiamata non inviata. Nessun numero valido inserito."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Numero segreteria mancante"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 508a337..3e3c509 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"תגובה מהירה"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"אפס את האפליקציה המוגדר כברירת מחדל"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"הודעה נשלחה אל <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"הגדרות חשבון טלפון"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"חשבון לשיחות יוצאות המשמש כברירת מחדל"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"‏חשבון לשיחות ב-Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"שאל בכל פעם"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏אל תשתמש בשיחות ב-Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"משתמש זה אינו רשאי לבצע שיחות טלפון שאינן שיחות חירום"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"השיחה לא נשלחה. לא הוזן מספר חוקי."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"חסר מספר של דואר קולי"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a014577..1caaccd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"クイック返信"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"デフォルトのアプリをリセット"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>にメッセージを送信しました。"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"携帯端末アカウントの設定"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"デフォルトの送信アカウント"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi発信アカウント"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"その都度確認"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi発信を使用しない"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"このユーザーは緊急通報以外の通話は発信できません"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"発信できません。有効な番号が入力されていません。"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ボイスメール番号がありません"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index fe21816..6e7eedf 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"სწრაფი პასუხი"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ნაგულისხმევი აპის ისევ დაყენება"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"შეტყობინება გაიგზავნა <xliff:g id="PHONE_NUMBER">%s</xliff:g>-თან."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ტელეფონის ანგარიშის პარამეტრები"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ნაგულისხმევი გამავალი ანგარიში"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"ანგარიში Wi-Fi დარეკვისთვის"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"მკითხე ყოველ ჯერზე"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi დარეკვა არ გამოიყენო"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ამ მომხმარებელს არ აქვს უფლება, განახორციელოს არასაგანგებო სატელეფონო ზარები."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ვერ გაიგზავნა, ტელეფონის ნომერი სწორად არ იქნა შეყვანილი."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ხმოვანი ფოსტის ნომერი არ არის"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 6f4547a..b5991d5 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Жылдам жауап"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Бастапқы қолдб-ға қайта реттеу"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Хабар <xliff:g id="PHONE_NUMBER">%s</xliff:g> нөміріне жіберілді."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Телефон есептік жазбасының параметрлері"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Әдепкі шығыс есептік жазба"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi қоңыраулар есептік жазбасы"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Әр қоңырау үшін сұрау"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi қоңырауларын пайдаланбау"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Бұл пайдаланушыға жедел емес қоңырауларды шалуға рұқсат етілмеген"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Қоңырау жіберілмеді, енгізілген нөмір жарамсыз."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Дауыс хабарының нөмірі жоқ"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d442256..e392e2d 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ឆ្លើយតប​រហ័ស"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"កំណត់​កម្មវិធី​លំនាំដើម​ឡើងវិញ"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"បាន​ផ្ញើ​សារ​ទៅ <xliff:g id="PHONE_NUMBER">%s</xliff:g> ។"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ការកំណត់​គណនី​ទូរស័ព្ទ"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"គណនី​ចេញ​លំនាំដើម"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"គណនី​ហៅ​តាម​វ៉ាយហ្វាយ"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"សួរ​ជានិច្ច"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"កុំ​ប្រើ​ការ​ហៅ​តាម​វ៉ាយហ្វាយ"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"អ្នក​ប្រើ​ម្នាក់​នេះ​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​បង្កើត​កា​រ​ហៅ​ទូរស័ព្ទ​ពេល​មិន​អាសន្ន"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"មិន​បាន​ផ្ញើ​ការ​ហៅ បាន​បញ្ចូល​លេខ​​​មិន​ត្រឹមត្រូវ។"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"បាត់​​ចំនួន​​សារ​ជា​សំឡេង"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f3c577f..9dca6a2 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> ಗೆ ಸಂದೇಶ ಕಳುಹಿಸಲಾಗಿದೆ."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ಫೋನ್ ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ಡೀಫಾಲ್ಟ್ ಹೊರಹೋಗುವ ಖಾತೆ"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi ಕರೆ ಮಾಡುವ ಖಾತೆ"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಬೇಡಿ"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ತುರ್ತುಸ್ಥಿತಿಯಲ್ಲದ ಫೋನ್‌ ಕರೆಗಳನ್ನು ಮಾಡಲು ಈ ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ಕರೆ ಮಾಡಲಾಗಿಲ್ಲ, ಯಾವುದೇ ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿಲ್ಲ."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆಯು ಕಾಣೆಯಾಗಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4ffb4d4..3d67c7f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"빠른 응답"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"기본 앱 재설정"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>(으)로 메시지를 보냈습니다."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"전화 계정 설정"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"기본 발신 계정"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi 통화 계정"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"항상 확인"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi 통화 사용 안함"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"일반 전화를 걸 수 없는 사용자입니다."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"잘못된 번호를 입력했으므로 전화를 걸지 못했습니다."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"음성사서함 번호 없음"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 2155c8c..3fe403b 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -45,11 +45,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Тез жооп"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Абалкы колдонмону өзгөртүү"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> номуруна билдирүү жөнөтүлдү."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Телефондун каттоо эсебинин жөндөөлөрү"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Демейки чыгуучу каттоо эсеби"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi чалуу үчүн каттоо эсеби"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Чалган сайын сурасын"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi чалуу колдонулбасын"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Бул колдонуучу шашылыш эмес чалууларды аткара албайт"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Чалуу жөнөтүлгөн жок, жарактуу номер киргизилген жок."</string>
     <!-- no translation found for no_vm_number (4164780423805688336) -->
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6ff0fe5..cac6273 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ຕອບກັບດ່ວນ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ຄືນຄ່າແອັບຯເລີ່ມຕົ້ນ"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="PHONE_NUMBER">%s</xliff:g> ແລ້ວ."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"​ການ​ຕັ້ງ​ຄ່າ​ບັນ​ຊີ​ໂທ​ລະ​ສັບ"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"​ບັນ​ຊີ​​ສົ່ງ​ອອກ​ເລີ່ມ​ຕົ້ນ"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"ບັນຊີ​ການ​ໂທ​ດ້ວຍ Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"​ຖາມ​ທຸກ​ເທື່ອ"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ບໍ່​ໃຊ້ການ​ໂທ​ດ້ວຍ Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ຜູ່​ໃຊ້​ນີ້ບໍ່​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ​ສຸກ​ເສີນ​ໄດ້"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ບໍ່ໄດ້ໂທເທື່ອ, ເບີໂທທີ່ລະບຸບໍ່ຖືກຕ້ອງ."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ບໍ່ມີເບີຂໍ້ຄວາມສຽງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8e5b7f4..74213ca 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Greitas atsakas"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Nustat. iš naujo numat. prog."</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Pranešimas išsiųstas numeriu <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefono paskyros nustatymai"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Numatytoji išsiunčiamoji paskyra"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"„Wi-Fi“ skambinimo paskyra"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Klausti kaskart"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nenaudoti „Wi-Fi“ skambinimo"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Šiam naudotojui leidžiama vykdyti tik skambučius pagalbos numeriais"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Skambutis neatliktas; įvestas netinkamas numeris."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Trūksta balso pašto numerio"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 70d3566..5c3fb24 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Ātrā atbilde"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Atiestatīt noklus. lietotni"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Ziņojums nosūt. uz šādu tālr. nr.: <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Tālruņa konta iestatījumi"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Noklusējuma izejošais konts"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi zvanu konts"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Jautāt katru reizi"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Neizmantot Wi-Fi zvanus"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Šim lietotājam nav atļauts veikt ārkārtas tālruņa zvanus."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Zvans nav nosūtīts; nav ievadīts derīgs numurs."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Trūkst balss pasta numura"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 717266d..2b02f38 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Брз одговор"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ресетирај стандардна апликација"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Порака е испратена на <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Поставки на телефонска сметка"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Стандардна излезна сметка"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Сметка за повикување преку Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Секогаш прашај"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не користи повикување преку Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Корисникот нема дозвола да прави телефонски повици ако не е итно"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Повикот не се поврза, внесен е неважечки број."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Недостасува број на говорна пошта"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 1f5a0dc..68b0679 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ദ്രുത പ്രതികരണം"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"സ്ഥിര അപ്ലിക്കേഷൻ പുനഃസജ്ജമാക്കുക"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> എന്നതിലേക്ക് സന്ദേശമയച്ചു."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ഫോൺ അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"സ്ഥിര ഔട്ട്ഗോയിംഗ് അക്കൗണ്ട്"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi കോൾ ചെയ്യൽ അക്കൗണ്ട്"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ഓരോ തവണയും ചോദിക്കുക"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi കോൾ ചെയ്യൽ ഉപയോഗിക്കരുത്"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"അത്യാവശ്യമല്ലാത്ത ഫോൺ കോളുകൾ ചെയ്യാൻ ഈ ഉപയോക്താവിനെ അനുവദിക്കുന്നില്ല"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"കോൾ ചെയ്യാനായില്ല, സാധുവായ നമ്പറൊന്നും നൽകിയിട്ടില്ല."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"വോയ്‌സ്മെയിൽ നമ്പർ കാണുന്നില്ല"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 59a5130..b38d1d1 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Шуурхай хариу"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Үндсэн апп-г сэргээх"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Зурвасыг <xliff:g id="PHONE_NUMBER">%s</xliff:g> руу илгээв."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Утасны акаунтын тохиргоо"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Үндсэн илгээх акаунт"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi дуудлагын акаунт"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Тухай бүрт асуух"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi дуудлага бүү ашиглана уу"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Энэ хэрэглэгч нь яаралтай бус утасны дуудлага хийх эрхгүй"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Дуудлага илгээгдсэнгүй, зөв дугаар оруулаагүй байна."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Дуут шуудангийн дугаар байхгүй"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 332a379..f0fdd48 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"द्रुत प्रतिसाद"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"डीफॉल्ट अ‍ॅप रीसेट करा"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"संदेश <xliff:g id="PHONE_NUMBER">%s</xliff:g> वर पाठविला."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"फोन खाते सेटिंग्ज"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"डीफॉल्ट केले जाणारे खाते"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi कॉल करण्याचे खाते"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"प्रत्येक वेळी विचारा"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi कॉल करणे वापरू नका"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"या वापरकर्त्यास आणीबाणी-नसलेले फोन कॉल करण्‍याची अनुमती नाही"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"कॉल पाठविला नाही, वैध नंबर प्रविेष्‍ट केला नाही."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"व्हॉइसमेल नंबर गहाळ"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index eb24231..d0d7846 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Respons pantas"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Tetapkan semula apl lalai"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesej dihantar ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Tetapan akaun telefon"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Akaun keluar lalai"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Akaun panggilan Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Tanya setiap kali"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Jangan gunakan panggilan Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Pengguna ini tidak dibenarkan membuat panggilan telefon bukan kecemasan"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Panggilan tidak dihantar, tiada nombor yang sah dimasukkan."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nombor mel suara tiada"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 61fe870..26809f7 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"အမြန်တုံ့ပြန်ချက်"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ပုံသေ အပ်ပလီကေးရှင်းအား ပြန်ပြောင်းရန်"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> ထံ စာတိုပို့လိုက်ပါပြီ"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ဖုန်း အကောင့် ဆက်တင်များ"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ပုံသေ အထွက် အကောင့်"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"ကြိုးမဲ့ ခေါ်ဆိုမှု အကောင့်"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"အကြိမ်တိုင်းမှာ မေးရန်"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ဒီအသုံးပြုသူအား အရေးပေါ် မဟုတ်သည့် ဖုန်း ခေါ်ဆိုမှုများ လုပ်ခွင့် မပြုပါ"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ခေါ်ဆို မရခဲ့ပါ၊ ထည့်သွင်းခဲ့သည့် နံပါတ် မမှန်ပါ"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"အသံစာပို့စနစ် နံပါတ် ပျောက်နေပါသည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 40ac0b9..36b1297 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hurtigsvar"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Tilbakestill standardappen"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Melding er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Kontoinnstillinger for telefonen"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standard utgående konto"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi-samtalekonto"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Spør hver gang"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ikke bruk Wi-Fi-anrop"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Denne brukeren har bare tillatelse til å ringe nødnumre"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Kunne ikke ringe. Du har ikke angitt et gyldig nummer."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Mangler nummer til telefonsvarer"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 7e0e52f..756b601 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"द्रुत प्रतिक्रिया"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"पूर्वनिर्धारित अनुप्रयोग पुनःसेट गर्नुहोस्"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> लाई सन्देश पठाइयो।"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"फोन खाता सेटिङहरू"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"बहिर्गमन पूर्वनिर्धारित खाता"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"वाइफाइ कल गर्ने खाता"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"प्रत्येक चोटि सोध्नुहोस्"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"वाइफाइ कल प्रयोग नगर्नुहोस्"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"यो प्रयोगकर्तालाई गैर-आकस्मिक फोन कल गर्न अनुमति छैन"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"कल पठाइएन, सही नम्बर प्रविष्टि गरिएको छैन।"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"भ्वाइसमेल नम्बर हराइरहेको छ"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c189cd6..9d5a1ee 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Snelle reactie"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Standaardapp opnieuw instellen"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Bericht verzonden naar <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Accountinstellingen voor telefoon"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standaard uitgaand account"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Account voor wifi-oproepen"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Altijd vragen"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Bellen via wifi niet gebruiken"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Het is deze gebruiker niet toegestaan niet-noodoproepen te plaatsen"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Oproep niet verzonden, geen geldig nummer ingevoerd."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Voicemailnummer ontbreekt"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 325bdeb..7d392ac 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Szybka odpowiedź"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Resetuj domyślną aplikację"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Wiadomość wysłano na numer <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Ustawienia konta telefonu"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Domyślne konto wychodzące"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto do połączeń telefonicznych przez Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Zawsze pytaj"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nie używaj połączeń Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ten użytkownik nie ma uprawnień do połączeń innych niż alarmowe"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Połączenie niezrealizowane. Nie podano poprawnego numeru."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Brakuje numeru poczty głosowej"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index be1e1e2..ed953a7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta rápida"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Repor aplicação predefinida"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensagem enviada para <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Definições da conta do telemóvel"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Conta de envio predefinida"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Conta de chamadas de Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Perguntar sempre"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Não utilizar chamadas de Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este utilizador não está autorizado a fazer chamadas telefónicas que não sejam de emergência"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"A chamada não foi efetuada. Não foi introduzido um número válido."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Número do correio de voz em falta"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 498f6e8..4174e42 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta rápida"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Redefinir aplicativo padrão"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensagem enviada para <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configurações da conta do smartphone"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Conta de envio padrão"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Conta de chamadas por Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Perguntar sempre"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Não usar chamadas por Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuário não tem permissão para fazer chamadas não emergenciais pelo smartphone"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Chamada não enviada: nenhum número válido foi inserido."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Número correio de voz ausente"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 89e539a..8010c9b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Răspuns rapid"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Resetați aplic. prestabilită"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesajul a fost trimis la <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Setările contului de pe telefon"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Cont predefinit pentru apeluri efectuate"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Cont pentru apelare Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Întreabă de fiecare dată"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nu utilizați apelurile Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Acest utilizator nu are permisiunea de a efectua apeluri telefonice către alte numere în afară de cele de urgență"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Apelul nu s-a trimis; niciun număr valid introdus."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Lipseşte numărul mesageriei vocale"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1136ce9..d95b887 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Быстрый ответ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Сбросить стандартные настройки"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Сообщение отправлено на номер <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Настройки аккаунта телефона"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Аккаунт по умолчанию для исходящих звонков"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Аккаунт для звонков по Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Всегда спрашивать"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не использовать Wi-Fi для звонков"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Этот пользователь может звонить только в службы экстренной помощи"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Для вызова укажите действительный номер телефона."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Не указан номер голосовой почты"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 0336368..fc1f24e 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ක්ෂණික ප්‍රතිචාරය"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"සුපුරුදු යෙදුම යළි සකසන්න"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> හට පණිවිඩය යවන්න."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"දුරකථන ගිණුම සැකසීම"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"සුපුරුදු එළියට යෑමේ ගිණුම"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi ඇමතුම් ගැනීමේ ගිණුම"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"සෑම වේලාවේම අසන්න"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi ඇමතුම භාවිතා කරන්න එපා"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"හදිසි-නැති දුරකථන ඇමතුම් සිදුකිරීමට මෙම පරිශීලකයාට අවසර නොමැත"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ඇමතුම නොයැවිණි, වලංගු අංකයක් ඇතුලත් කර නැත."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"හඬ තැපැල් අංකය නැත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a898af6..f0fb553 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Rýchla odpoveď"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Obnoviť predvolenú aplikáciu"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Správa bola odoslaná na číslo <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Nastavenia telefónneho účtu"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Predvolený odchádzajúci účet"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Účet volania prostredníctvom siete Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Vždy sa opýtať"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nepoužívať volanie prostredníctvom siete Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Tento používateľ smie uskutočňovať iba tiesňové hovory."</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Hovor sa nepodarilo spojiť, nebolo zadané platné číslo."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Chýba číslo hlasovej schránky"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 54991b7..a0eb220 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hiter odgovor"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ponastavi privzeto aplikacijo"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"SMS poslan na številko <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Nastavitve računa telefona"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Privzeti račun za odhodne klice"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Račun za klicanje prek povezave Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Vedno vprašaj"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne uporabljaj klicanja prek povezave Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Temu uporabniku ni dovoljeno telefoniranje, razen klicev v sili"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Klic ni bil poslan, veljavna številka ni vnesena."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Manjkajoča številka glasovne pošte"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a43e987..2e49851 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Брзи одговор"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ресетуј подразумев. апликацију"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Порука је послата на број <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Подешавања налога на телефону"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Подразумевани одлазни налог"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Налог за Wi-Fi позивање"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Питај сваки пут"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не користи Wi-Fi позивање"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Овом кориснику није дозвољено да упућује телефонске позиве који нису хитни"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Позив није послат, није унет важећи број."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Недостаје број за говорну пошту"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 219bffd..8abbe72 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Snabbsvar"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Återställ standardappen"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelandet har skickats till <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Kontoinställningar för mobil"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standardkonto för utgående samtal"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto för Wi-Fi-samtal"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Fråga varje gång"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Använd inte Wi-Fi-samtal"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Denna användare har inte tillåtelse att ringa icke-akuta samtal"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Samtalet har inte skickats. Du måste ange ett giltigt nummer."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nummer till röstbrevlåda saknas"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index de4e530..6395aba 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Majibu ya haraka"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Weka upya programu chaguo-msingi"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Ujumbe uliotumwa kwa <xliff:g id="PHONE_NUMBER">%s</xliff:g> ."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Mipangilio ya akaunti ya simu"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Akaunti chaguo-msingi ya simu zinazotoka"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Akaunti ya kupiga simu ya Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Uliza kila wakati"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Usitumie upigaji simu wa Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Mtumiaji huyu haruhusiwi kupiga simu zisizo za dharura"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Simu haijatumwa, hakuna nambari sahihi iliyowekwa."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nambari ya sauti inayokosekana"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index df9fbac..4b29058 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"விரைவு பதில்"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"இயல்பு பயன்பாட்டை மீட்டமை"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> க்குச் செய்தி அனுப்பப்பட்டது."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ஃபோன் கணக்கு அமைப்புகள்"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"அழைப்பிற்கான இயல்புநிலை கணக்கு"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"வைஃபை அழைப்பிற்கான கணக்கு"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ஒவ்வொரு முறையும் கேள்"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"வைஃபை அழைப்பைப் பயன்படுத்தாதே"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"அவசரமற்ற ஃபோன் அழைப்புகளைச் செய்ய இவருக்கு அனுமதியில்லை"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"அழைக்க முடியவில்லை, சரியான எண் உள்ளிடப்படவில்லை."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"குரலஞ்சல் எண் இல்லை"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index bc1af17..4a660cd 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"శీఘ్ర ప్రతిస్పందన"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"డిఫాల్ట్ అనువర్తనాన్ని రీసెట్ చేయి"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>కు సందేశం పంపబడింది."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ఫోన్ ఖాతా సెట్టింగ్‌లు"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"డిఫాల్ట్ అవుట్‌గోయింగ్ ఖాతా"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi కాలింగ్ ఖాతా"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ప్రతిసారి అడుగు"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi కాలింగ్‌ను ఉపయోగించవద్దు"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ఈ వినియోగదారుకి అత్యవసరం కాని ఫోన్ కాల్‌లు చేయడానికి అనుమతి లేదు"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"కాల్ చేయలేరు, చెల్లుబాటు అయ్యే నంబర్ నమోదు చేయలేదు."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"వాయిస్ మెయిల్ నంబర్ లేదు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 968a955..78f2ee4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"คำตอบด่วน"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"รีเซ็ตแอปพลิเคชันเริ่มต้น"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ส่งข้อความไปยัง <xliff:g id="PHONE_NUMBER">%s</xliff:g> แล้ว"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"การตั้งค่าบัญชีโทรศัพท์"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"บัญชีขาออกเริ่มต้น"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"บัญชีสำหรับการโทรผ่าน Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ถามทุกครั้ง"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ไม่ใช้การโทรผ่าน Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ไม่อนุญาตให้ผู้ใช้รายนี้ดำเนินการโทรที่ไม่ฉุกเฉิน"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"ไม่ได้โทรออก ไม่ได้ป้อนหมายเลขที่ถูกต้อง"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ไม่มีหมายเลขข้อความเสียง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a61453b..0b7f481 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Mabilisang tugon"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"I-reset ang default na app"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Naipadala ang mensahe sa <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Mga setting ng account ng telepono"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Default na papalabas na account"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Account sa pagtawag sa pamamagitan ng Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Magtanong palagi"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Huwag gumamit ng pagtawag sa pamamagitan ng Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Hindi pinapahintulutan ang user na ito na gumawa ng mga hindi pang-emergency na tawag sa telepono"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Hindi naipadala ang tawag, walang inilagay na wastong numero."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nawawala ang numero ng voicemail"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6a4427d..662bee5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hızlı yanıt"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Varsayılan uygulamayı sıfırla"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesaj, <xliff:g id="PHONE_NUMBER">%s</xliff:g> numaralı telefona gönderildi."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefon hesabı ayarları"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Varsayılan giden hesabı"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Kablosuz çağrı hesabı"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Her zaman sor"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Kablosuz çağrıyı kullanma"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Bu kullanıcının acil olmayan telefon çağrıları yapmasına izin verilmiyor"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Çağrı gönderilmedi, geçerli bir numara girilmedi."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Eksik sesli mesaj numarası"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 76e8f19..cb89808 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Швидка відповідь"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Скинути програму за умовчанням"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Повідомлення надіслано на номер <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Налаштування облікового запису на телефоні"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Вихідний обліковий запис за умовчанням"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Обліковий запис для дзвінків через Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Запитувати щоразу"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не використовувати дзвінки через Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Цьому користувачу не дозволено здійснювати звичайні телефонні дзвінки"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Дзвінок не відбувся, введіть дійсний номер."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Відстун. номер голос. пошти"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 3d98a9c..a403f29 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"فوری جواب"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ڈیفالٹ ایپ دوبارہ ترتیب دیں"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"پیغام <xliff:g id="PHONE_NUMBER">%s</xliff:g> کو بھیج دیا گیا۔"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"فون اکاؤنٹ کی ترتیبات"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ڈیفالٹ آؤٹ گوئنگ اکاؤنٹ"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"‏Wi-Fi کالنگ اکاؤنٹ"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"ہر بار پوچھیں"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏Wi-Fi کالنگ کا استعمال نہ کریں"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"اس صارف کو غیر ہنگامی فون کالیں کرنے کی اجازت نہیں ہے"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"کال نہیں بھیجی گئی، کوئی درست نمبر درج نہیں کیا گیا۔"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"صوتی میل نمبر درج نہیں ہے"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 876a783..96a456c 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tezkor javob"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Standart ilovani tiklash"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Xabar <xliff:g id="PHONE_NUMBER">%s</xliff:g>ga jo‘natildi."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefon hisobi sozlamalari"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Chiquvchi qo‘ng‘iroqlar uchun birlamchi hisob"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi qo‘ng‘iroqlar uchun hisob"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Har safar so‘ralsin"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi qo‘ng‘iroqlardan foydalanilmasin"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ushbu foydalanuvchiga favqulodda qo‘ng‘iroqlardan boshqa telefon qo‘ng‘iroqlarini amalga oshirish uchun ruxsat berilmagan"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Qo‘ng‘iroq amalga oshmadi, chunki raqam noto‘g‘ri kiritildi"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Javobsiz ovozli xabar raqami"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ea5aa9e..83d75ba 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Trả lời nhanh"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Đặt lại ứng dụng mặc định"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Đã gửi tin nhắn tới <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Cài đặt tài khoản điện thoại"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"Tài khoản gọi mặc định"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Tài khoản gọi qua Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Luôn hỏi"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Không sử dụng tính năng gọi qua Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Người dùng này không được phép thực hiện cuộc gọi điện thoại không khẩn cấp"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Không gọi được, bạn đã nhập số không hợp lệ."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Thiếu số thư thoại"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bcfa47b..e085d1e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回复"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重置默认应用"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"讯息已发送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"电话帐户设置"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"默认拨出帐户"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"WLAN通话帐户"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"每次都询问"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"不使用WLAN通话功能"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"此用户无权拨打非紧急呼救电话"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"拨号失败，因为输入的号码无效。"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"缺少语音信箱号码"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2b1ed21..a775f59 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回應"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重設預設應用程式"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"訊息已傳送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"手機帳戶設定"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"預設輸出帳戶"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi 通話帳戶"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"每次都詢問"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"不要使用 Wi-Fi 通話功能"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"這位使用者只可撥打緊急電話"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"無法傳送，輸入的號碼無效。"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"未填留言信箱號碼"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bd1299e..3922f91 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回應"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重設預設應用程式"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"訊息已傳送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"手機帳戶設定"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"預設撥號帳戶"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi 通話帳戶"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"每次都詢問"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"不使用 Wi-Fi 通話功能"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"這位使用者只能撥打緊急電話"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"輸入的號碼無效，無法撥出。"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"遺失語音信箱號碼"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e6f7ad6..f498490 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -36,11 +36,6 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Izimpendulo ezisheshayo"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Setha kabusha uhlelo lokusebenza lokuzenzakalelayo"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Umlayezo othunyelwe ku <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Izilungiselelo ze-akhawunti yefoni"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"I-akhawunti yokuphuma ezenzakalelayo"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"I-akhawunti yokushaya ye-Wi-Fi"</string>
-    <string name="account_ask_every_time" msgid="944077828070287407">"Buza ngaso sonke isikhathi"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ungasebenzisi ukushaya nge-Wi-Fi"</string>
     <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Lo msebenzisi akavunyelwe ukwenza amakholi wefoni okungewona wesimo esiphuthumayo"</string>
     <string name="outgoing_call_error_no_phone_number_supplied" msgid="4987143284589568716">"Ikholi ayithunyelwe, ayikho inombolo evumelekile efakiwe."</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Inombolo engekho yomyalezo wezwi"</string>
diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 6f915a3..4a0198b 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -24,16 +24,16 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.ContactsContract.Contacts;
-import android.telecomm.Connection;
-import android.telecomm.PhoneCapabilities;
-import android.telecomm.PropertyPresentation;
 import android.telecomm.CallState;
+import android.telecomm.Connection;
 import android.telecomm.GatewayInfo;
 import android.telecomm.ParcelableConnection;
 import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneAccountHandle;
+import android.telecomm.PhoneCapabilities;
 import android.telecomm.Response;
 import android.telecomm.StatusHints;
+import android.telecomm.TelecommManager;
 import android.telecomm.VideoProfile;
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
@@ -198,13 +198,17 @@
     /** The handle with which to establish this call. */
     private Uri mHandle;
 
-    /** The {@link PropertyPresentation} that controls how the handle is shown. */
+    /**
+     * The presentation requirements for the handle. See {@link TelecommManager} for valid values.
+     */
     private int mHandlePresentation;
 
     /** The caller display name (CNAP) set by the connection service. */
     private String mCallerDisplayName;
 
-    /** The {@link PropertyPresentation} that controls how the caller display name is shown. */
+    /**
+     * The presentation requirements for the handle. See {@link TelecommManager} for valid values.
+     */
     private int mCallerDisplayNamePresentation;
 
     /**
@@ -304,7 +308,7 @@
         mState = isConference ? CallState.ACTIVE : CallState.NEW;
         mRepository = repository;
         setHandle(handle);
-        setHandle(handle, PropertyPresentation.ALLOWED);
+        setHandle(handle, TelecommManager.PRESENTATION_ALLOWED);
         mGatewayInfo = gatewayInfo;
         mConnectionManagerPhoneAccountHandle = connectionManagerPhoneAccountHandle;
         mTargetPhoneAccountHandle = targetPhoneAccountHandle;
@@ -382,7 +386,7 @@
 
 
     void setHandle(Uri handle) {
-        setHandle(handle, PropertyPresentation.ALLOWED);
+        setHandle(handle, TelecommManager.PRESENTATION_ALLOWED);
     }
 
     void setHandle(Uri handle, int presentation) {
@@ -459,7 +463,7 @@
      */
     public Uri getOriginalHandle() {
         if (mGatewayInfo != null && !mGatewayInfo.isEmpty()) {
-            return mGatewayInfo.getOriginalHandle();
+            return mGatewayInfo.getOriginalAddress();
         }
         return getHandle();
     }
diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index bc953bd..5445bef 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -296,9 +296,10 @@
 
         // Only dial with the requested phoneAccount if it is still valid. Otherwise treat this call
         // as if a phoneAccount was not specified (does the default behavior instead).
+        // Note: We will not attempt to dial with a requested phoneAccount if it is disabled.
         if (phoneAccountHandle != null) {
             List<PhoneAccountHandle> enabledAccounts =
-                    app.getPhoneAccountRegistrar().getOutgoingPhoneAccounts();
+                    app.getPhoneAccountRegistrar().getEnabledPhoneAccounts(handle.getScheme());
             if (!enabledAccounts.contains(phoneAccountHandle)) {
                 phoneAccountHandle = null;
             }
@@ -361,7 +362,7 @@
             return;
         }
 
-        final Uri uriHandle = (gatewayInfo == null) ? handle : gatewayInfo.getGatewayHandle();
+        final Uri uriHandle = (gatewayInfo == null) ? handle : gatewayInfo.getGatewayAddress();
 
         if (gatewayInfo == null) {
             Log.i(this, "Creating a new outgoing call with handle: %s", Log.piiHandle(uriHandle));
diff --git a/src/com/android/telecomm/ConnectionServiceWrapper.java b/src/com/android/telecomm/ConnectionServiceWrapper.java
index 98b624d..00037ed 100644
--- a/src/com/android/telecomm/ConnectionServiceWrapper.java
+++ b/src/com/android/telecomm/ConnectionServiceWrapper.java
@@ -16,7 +16,6 @@
 
 package com.android.telecomm;
 
-import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.net.Uri;
 import android.os.Bundle;
@@ -610,14 +609,14 @@
                 GatewayInfo gatewayInfo = call.getGatewayInfo();
                 Bundle extras = call.getExtras();
                 if (gatewayInfo != null && gatewayInfo.getGatewayProviderPackageName() != null &&
-                        gatewayInfo.getOriginalHandle() != null) {
+                        gatewayInfo.getOriginalAddress() != null) {
                     extras = (Bundle) extras.clone();
                     extras.putString(
                             NewOutgoingCallIntentBroadcaster.EXTRA_GATEWAY_PROVIDER_PACKAGE,
                             gatewayInfo.getGatewayProviderPackageName());
                     extras.putParcelable(
                             NewOutgoingCallIntentBroadcaster.EXTRA_GATEWAY_ORIGINAL_URI,
-                            gatewayInfo.getOriginalHandle());
+                            gatewayInfo.getOriginalAddress());
                 }
 
                 try {
@@ -932,7 +931,7 @@
         // Make a list of ConnectionServices that are listed as being associated with SIM accounts
         final Set<ConnectionServiceWrapper> simServices = Collections.newSetFromMap(
                 new ConcurrentHashMap<ConnectionServiceWrapper, Boolean>(8, 0.9f, 1));
-        for (PhoneAccountHandle handle : registrar.getOutgoingPhoneAccounts()) {
+        for (PhoneAccountHandle handle : registrar.getEnabledPhoneAccounts()) {
             PhoneAccount account = registrar.getPhoneAccount(handle);
             if ((account.getCapabilities() & PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) != 0) {
                 ConnectionServiceWrapper service =
diff --git a/src/com/android/telecomm/CreateConnectionProcessor.java b/src/com/android/telecomm/CreateConnectionProcessor.java
index fcf94cc..023f43e 100644
--- a/src/com/android/telecomm/CreateConnectionProcessor.java
+++ b/src/com/android/telecomm/CreateConnectionProcessor.java
@@ -235,31 +235,39 @@
         if (TelephonyUtil.shouldProcessAsEmergency(TelecommApp.getInstance(), mCall.getHandle())) {
             Log.i(this, "Emergency number detected");
             mAttemptRecords.clear();
-            List<PhoneAccountHandle> allAccountHandles = TelecommApp.getInstance()
-                    .getPhoneAccountRegistrar().getOutgoingPhoneAccounts();
-            // First, add the PSTN phone account
-            for (int i = 0; i < allAccountHandles.size(); i++) {
-                if (TelephonyUtil.isPstnComponentName(
-                        allAccountHandles.get(i).getComponentName())) {
-                    Log.i(this, "Will try PSTN account %s for emergency", allAccountHandles.get(i));
+            List<PhoneAccount> allAccounts = TelecommApp.getInstance()
+                    .getPhoneAccountRegistrar().getAllPhoneAccounts();
+            // First, add SIM phone accounts which can place emergency calls.
+            for (PhoneAccount phoneAccount : allAccounts) {
+                if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS) &&
+                        phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+                    Log.i(this, "Will try PSTN account %s for emergency",
+                            phoneAccount.getAccountHandle());
                     mAttemptRecords.add(
                             new CallAttemptRecord(
-                                    allAccountHandles.get(i),
-                                    allAccountHandles.get(i)));
+                                    phoneAccount.getAccountHandle(),
+                                    phoneAccount.getAccountHandle()));
                 }
             }
 
-            // Next, add the connection manager account as a backup.
-            PhoneAccountHandle callManager = TelecommApp.getInstance()
+            // Next, add the connection manager account as a backup if it can place emergency calls.
+            PhoneAccountHandle callManagerHandle = TelecommApp.getInstance()
                     .getPhoneAccountRegistrar().getSimCallManager();
-            CallAttemptRecord callAttemptRecord = new CallAttemptRecord(callManager,
-                    TelecommApp.getInstance().getPhoneAccountRegistrar().
-                            getDefaultOutgoingPhoneAccount(mCall.getHandle().getScheme()));
+            if (callManagerHandle != null) {
+                PhoneAccount callManager = TelecommApp.getInstance()
+                        .getPhoneAccountRegistrar().getPhoneAccount(callManagerHandle);
+                if (callManager.hasCapabilities(PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS)) {
+                    CallAttemptRecord callAttemptRecord = new CallAttemptRecord(callManagerHandle,
+                            TelecommApp.getInstance().getPhoneAccountRegistrar().
+                                    getDefaultOutgoingPhoneAccount(mCall.getHandle().getScheme())
+                    );
 
-            if (callManager != null && !mAttemptRecords.contains(callAttemptRecord)) {
-                Log.i(this, "Will try Connection Manager account %s for emergency",
-                        callManager);
-                mAttemptRecords.add(callAttemptRecord);
+                    if (!mAttemptRecords.contains(callAttemptRecord)) {
+                        Log.i(this, "Will try Connection Manager account %s for emergency",
+                                callManager);
+                        mAttemptRecords.add(callAttemptRecord);
+                    }
+                }
             }
         }
     }
diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 981a640..59c06b5 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -36,7 +36,7 @@
 import android.telecomm.InCallService;
 import android.telecomm.ParcelableCall;
 import android.telecomm.PhoneCapabilities;
-import android.telecomm.PropertyPresentation;
+import android.telecomm.TelecommManager;
 import android.util.ArrayMap;
 
 import com.android.internal.telecomm.IInCallService;
@@ -464,10 +464,10 @@
             capabilities |= PhoneCapabilities.RESPOND_VIA_TEXT;
         }
 
-        Uri handle = call.getHandlePresentation() == PropertyPresentation.ALLOWED ?
+        Uri handle = call.getHandlePresentation() == TelecommManager.PRESENTATION_ALLOWED ?
                 call.getHandle() : null;
         String callerDisplayName = call.getCallerDisplayNamePresentation() ==
-                PropertyPresentation.ALLOWED ?  call.getCallerDisplayName() : null;
+                TelecommManager.PRESENTATION_ALLOWED ?  call.getCallerDisplayName() : null;
 
         List<Call> conferenceableCalls = call.getConferenceableCalls();
         List<String> conferenceableCallIds = new ArrayList<String>(conferenceableCalls.size());
diff --git a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
index 14c86bc..e2b4a15 100644
--- a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
+++ b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
@@ -199,6 +199,7 @@
         Log.v(this, "isPotentialEmergencyNumber = %s", isPotentialEmergencyNumber);
 
         rewriteCallIntentAction(intent, isPotentialEmergencyNumber);
+        action = intent.getAction();
         // True for certain types of numbers that are not intended to be intercepted or modified
         // by third parties (e.g. emergency numbers).
         boolean callImmediately = false;
diff --git a/src/com/android/telecomm/PhoneAccountBroadcastReceiver.java b/src/com/android/telecomm/PhoneAccountBroadcastReceiver.java
index 8f70211..69639b6 100644
--- a/src/com/android/telecomm/PhoneAccountBroadcastReceiver.java
+++ b/src/com/android/telecomm/PhoneAccountBroadcastReceiver.java
@@ -24,9 +24,15 @@
 import java.lang.String;
 
 /**
- * Captures {@code android.intent.action.PACKAGE_REMOVED} intents and triggers the removal of
- * associated {@link android.telecomm.PhoneAccount}s via the
+ * Captures {@code android.intent.action.ACTION_PACKAGE_FULLY_REMOVED} intents and triggers the
+ * removal of associated {@link android.telecomm.PhoneAccount}s via the
  * {@link com.android.telecomm.PhoneAccountRegistrar}.
+ * Note: This class listens for the {@code PACKAGE_FULLY_REMOVED} intent rather than
+ * {@code PACKAGE_REMOVED} as {@code PACKAGE_REMOVED} is triggered on re-installation of the same
+ * package, where {@code PACKAGE_FULLY_REMOVED} is triggered only when an application is completely
+ * uninstalled.  This is desirable as we do not wish to un-register all
+ * {@link android.telecomm.PhoneAccount}s associated with a package being re-installed to ensure
+ * the enabled state of the accounts is retained.
  */
 public class PhoneAccountBroadcastReceiver extends BroadcastReceiver {
     /**
@@ -37,7 +43,7 @@
      */
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
+        if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(intent.getAction())) {
             Uri uri = intent.getData();
             if (uri == null) {
                 return;
diff --git a/src/com/android/telecomm/PhoneAccountRegistrar.java b/src/com/android/telecomm/PhoneAccountRegistrar.java
index 4223b63..7aa9261 100644
--- a/src/com/android/telecomm/PhoneAccountRegistrar.java
+++ b/src/com/android/telecomm/PhoneAccountRegistrar.java
@@ -78,7 +78,7 @@
 
     private static final String FILE_NAME = "phone-account-registrar-state.xml";
     @VisibleForTesting
-    public static final int EXPECTED_STATE_VERSION = 2;
+    public static final int EXPECTED_STATE_VERSION = 3;
 
     /** Keep in sync with the same in SipSettings.java */
     private static final String SIP_SHARED_PREFERENCES = "SIP_PREFERENCES";
@@ -118,7 +118,7 @@
             }
         }
 
-        List<PhoneAccountHandle> outgoing = getOutgoingPhoneAccounts(uriScheme);
+        List<PhoneAccountHandle> outgoing = getEnabledPhoneAccounts(uriScheme);
         switch (outgoing.size()) {
             case 0:
                 // There are no accounts, so there can be no default
@@ -166,7 +166,8 @@
                 return;
             }
 
-            if (!has(getPhoneAccount(accountHandle), PhoneAccount.CAPABILITY_CALL_PROVIDER)) {
+            if (!getPhoneAccount(accountHandle).hasCapabilities(
+                    PhoneAccount.CAPABILITY_CALL_PROVIDER)) {
                 Log.w(this, "Trying to set non-call-provider default outgoing %s",
                         accountHandle);
                 return;
@@ -189,7 +190,8 @@
             if (callManagerAccount == null) {
                 Log.d(this, "setSimCallManager: Nonexistent call manager: %s", callManager);
                 return;
-            } else if (!has(callManagerAccount, PhoneAccount.CAPABILITY_CONNECTION_MANAGER)) {
+            } else if (!callManagerAccount.hasCapabilities(
+                    PhoneAccount.CAPABILITY_CONNECTION_MANAGER)) {
                 Log.d(this, "setSimCallManager: Not a call manager: %s", callManagerAccount);
                 return;
             }
@@ -251,6 +253,11 @@
         return null;
     }
 
+    /**
+     * Retrieves a list of all {@link PhoneAccountHandle}s registered.
+     *
+     * @return The list of {@link PhoneAccountHandle}s.
+     */
     public List<PhoneAccountHandle> getAllPhoneAccountHandles() {
         List<PhoneAccountHandle> accountHandles = new ArrayList<>();
         for (PhoneAccount m : mState.accounts) {
@@ -263,17 +270,45 @@
         return new ArrayList<>(mState.accounts);
     }
 
-    public List<PhoneAccountHandle> getOutgoingPhoneAccounts() {
+    /**
+     * Determines the number of enabled and disabled {@link PhoneAccount}s.
+     *
+     * @return The number of enabled and disabled {@link PhoneAccount}s
+     */
+    public int getAllPhoneAccountsCount() {
+        return mState.accounts.size();
+    }
+
+    /**
+     * Retrieves a list of all enabled call provider phone accounts.
+     *
+     * @return The phone account handles.
+     */
+    public List<PhoneAccountHandle> getEnabledPhoneAccounts() {
         return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CALL_PROVIDER);
     }
 
-    public List<PhoneAccountHandle> getOutgoingPhoneAccounts(String uriScheme) {
-        return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CALL_PROVIDER, uriScheme);
+    /**
+     * Retrieves a list of all enabled phone account call provider phone accounts supporting the
+     * specified URI scheme.
+     *
+     * @param uriScheme The URI scheme.
+     * @return The phone account handles.
+     */
+    public List<PhoneAccountHandle> getEnabledPhoneAccounts(String uriScheme) {
+        return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CALL_PROVIDER, uriScheme,
+                false /* includeDisabled */);
     }
 
-    public List<PhoneAccountHandle> getAllConnectionManagerPhoneAccounts() {
+    /**
+     * Retrieves a list of all enabled phone account handles with the connection manager capability.
+     *
+     * @return The phone account handles.
+     */
+    public List<PhoneAccountHandle> getConnectionManagerPhoneAccounts() {
         if (isEnabledConnectionManager()) {
-            return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER);
+            return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER,
+                    null /* supportedUriScheme */, false /* includeDisabled */);
         }
         return Collections.emptyList();
     }
@@ -287,6 +322,43 @@
         return null;
     }
 
+    /**
+     * Changes the enabled state of the {@link PhoneAccount} identified by a
+     * {@link PhoneAccountHandle}.
+     *
+     * @param handle The {@link PhoneAccountHandle}.
+     * @param isEnabled The new enabled state of the {@link PhoneAccount}.
+     */
+    public void setPhoneAccountEnabled(PhoneAccountHandle handle, boolean isEnabled) {
+        PhoneAccount existing = getPhoneAccount(handle);
+        if (existing.isEnabled() == isEnabled) {
+            return;
+        }
+
+        // Do not permit PhoneAccounts which are marked as always enabled to be disabled.
+        if (existing.hasCapabilities(PhoneAccount.CAPABILITY_ALWAYS_ENABLED)) {
+            return;
+        }
+
+        // If we are disabling the current default outgoing phone account or Sim call manager we
+        // need to null out those preferences.
+        if (!isEnabled) {
+            if (mState.defaultOutgoing != null && mState.defaultOutgoing.equals(handle)) {
+                setUserSelectedOutgoingPhoneAccount(null);
+            }
+
+            if (mState.simCallManager != null && mState.simCallManager.equals(handle)) {
+                setSimCallManager(null);
+            }
+        }
+
+
+        PhoneAccount.Builder builder = existing.toBuilder().setEnabled(isEnabled);
+        PhoneAccount replacement = builder.build();
+
+        addOrReplacePhoneAccount(replacement);
+    }
+
     // TODO: Should we implement an artificial limit for # of accounts associated with a single
     // ComponentName?
     public void registerPhoneAccount(PhoneAccount account) {
@@ -299,6 +371,22 @@
                     "PhoneAccount connection service requires BIND_CONNECTION_SERVICE permission.");
         }
 
+        // If there is an existing PhoneAccount already registered with this handle, copy its
+        // enabled state to the new phone account.
+        PhoneAccount existing = getPhoneAccount(account.getAccountHandle());
+        if (existing != null) {
+            account = account.toBuilder().setEnabled(existing.isEnabled()).build();
+        }
+
+        addOrReplacePhoneAccount(account);
+    }
+
+    /**
+     * Adds a {@code PhoneAccount}, replacing an existing one if found.
+     *
+     * @param account The {@code PhoneAccount} to add or replace.
+     */
+    private void addOrReplacePhoneAccount(PhoneAccount account) {
         mState.accounts.add(account);
         // Search for duplicates and remove any that are found.
         for (int i = 0; i < mState.accounts.size() - 1; i++) {
@@ -406,33 +494,32 @@
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
 
-    // TODO: Add a corresponding has(...) method to class PhoneAccount itself and remove this one
-    // Return true iff the given account has all the specified capability flags
-    static boolean has(PhoneAccount account, int capability) {
-        return (account.getCapabilities() & capability) == capability;
-    }
-
     /**
      * Returns a list of phone account handles with the specified flag.
      *
      * @param flags Flags which the {@code PhoneAccount} must have.
      */
     private List<PhoneAccountHandle> getPhoneAccountHandles(int flags) {
-        return getPhoneAccountHandles(flags, null);
+        return getPhoneAccountHandles(flags, null, false /* includeDisabled */);
     }
 
     /**
      * Returns a list of phone account handles with the specified flag, supporting the specified
-     * URI scheme.
+     * URI scheme.  By default, only enabled phone accounts are included, unless the
+     * {@code includeDisabled} parameter is set {@code true}.
      *
      * @param flags Flags which the {@code PhoneAccount} must have.
      * @param uriScheme URI schemes the PhoneAccount must handle.  {@code Null} bypasses the
      *                  URI scheme check.
+     * @param includeDisabled When {@code true}, the list of phone accounts handles includes those
+     *                        which are marked as disabled.
      */
-    private List<PhoneAccountHandle> getPhoneAccountHandles(int flags, String uriScheme) {
+    private List<PhoneAccountHandle> getPhoneAccountHandles(int flags, String uriScheme,
+            boolean includeDisabled) {
         List<PhoneAccountHandle> accountHandles = new ArrayList<>();
         for (PhoneAccount m : mState.accounts) {
-            if (has(m, flags) && (uriScheme == null || m.supportsUriScheme(uriScheme))) {
+            if ((includeDisabled || m.isEnabled()) && m.hasCapabilities(flags) &&
+                    (uriScheme == null || m.supportsUriScheme(uriScheme))) {
                 accountHandles.add(m.getAccountHandle());
             }
         }
@@ -596,7 +683,6 @@
                     if (toSerialize != null ){
                         serializer.text(toSerialize);
                     }
-
                     serializer.endTag(null, VALUE_TAG);
                 }
             } else {
@@ -628,6 +714,7 @@
             int outerDepth = parser.getDepth();
             while (XmlUtils.nextElementWithin(parser, outerDepth)) {
                 if (parser.getName().equals(VALUE_TAG)) {
+                    parser.next();
                     value = parser.getText();
                     arrayEntries.add(value);
                 }
@@ -725,6 +812,9 @@
         private static final String LABEL = "label";
         private static final String SHORT_DESCRIPTION = "short_description";
         private static final String SUPPORTED_URI_SCHEMES = "supported_uri_schemes";
+        private static final String ENABLED = "enabled";
+        private static final String TRUE = "true";
+        private static final String FALSE = "false";
 
         @Override
         public void writeToXml(PhoneAccount o, XmlSerializer serializer)
@@ -745,6 +835,7 @@
                 writeTextSafely(LABEL, o.getLabel(), serializer);
                 writeTextSafely(SHORT_DESCRIPTION, o.getShortDescription(), serializer);
                 writeStringList(SUPPORTED_URI_SCHEMES, o.getSupportedUriSchemes(), serializer);
+                writeTextSafely(ENABLED, o.isEnabled() ? TRUE : FALSE, serializer);
 
                 serializer.endTag(null, CLASS_PHONE_ACCOUNT);
             }
@@ -762,6 +853,7 @@
                 String label = null;
                 String shortDescription = null;
                 List<String> supportedUriSchemes = null;
+                boolean enabled = false;
 
                 while (XmlUtils.nextElementWithin(parser, outerDepth)) {
                     if (parser.getName().equals(ACCOUNT_HANDLE)) {
@@ -789,6 +881,9 @@
                         shortDescription = parser.getText();
                     } else if (parser.getName().equals(SUPPORTED_URI_SCHEMES)) {
                         supportedUriSchemes = readStringList(parser);
+                    } else if (parser.getName().equals(ENABLED)) {
+                        parser.next();
+                        enabled = parser.getText().equals(TRUE);
                     }
                 }
 
@@ -813,6 +908,17 @@
                     }
                 }
 
+                // Prior to version 3, PhoneAccounts didn't include the enabled option.  Enable
+                // all TelephonyConnectionService phone accounts by default.
+                if (version < 3) {
+                    ComponentName telephonyComponentName = new ComponentName("com.android.phone",
+                            "com.android.services.telephony.TelephonyConnectionService");
+
+                    if (accountHandle.getComponentName().equals(telephonyComponentName)) {
+                        enabled = true;
+                    }
+                }
+
                 return PhoneAccount.builder(accountHandle, label)
                         .setAddress(address)
                         .setSubscriptionAddress(subscriptionAddress)
@@ -820,6 +926,7 @@
                         .setIconResId(iconResId)
                         .setShortDescription(shortDescription)
                         .setSupportedUriSchemes(supportedUriSchemes)
+                        .setEnabled(enabled)
                         .build();
             }
             return null;
diff --git a/src/com/android/telecomm/TelecommServiceImpl.java b/src/com/android/telecomm/TelecommServiceImpl.java
index 93337a5..cce34d0 100644
--- a/src/com/android/telecomm/TelecommServiceImpl.java
+++ b/src/com/android/telecomm/TelecommServiceImpl.java
@@ -192,11 +192,11 @@
     }
 
     @Override
-    public List<PhoneAccountHandle> getOutgoingPhoneAccounts() {
+    public List<PhoneAccountHandle> getEnabledPhoneAccounts() {
         try {
-            return mPhoneAccountRegistrar.getOutgoingPhoneAccounts();
+            return mPhoneAccountRegistrar.getEnabledPhoneAccounts();
         } catch (Exception e) {
-            Log.e(this, e, "getOutgoingPhoneAccounts");
+            Log.e(this, e, "getEnabledPhoneAccounts");
             throw e;
         }
     }
@@ -204,7 +204,7 @@
     @Override
     public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme) {
         try {
-            return mPhoneAccountRegistrar.getOutgoingPhoneAccounts(uriScheme);
+            return mPhoneAccountRegistrar.getEnabledPhoneAccounts(uriScheme);
         } catch (Exception e) {
             Log.e(this, e, "getPhoneAccountsSupportingScheme");
             throw e;
@@ -222,6 +222,36 @@
     }
 
     @Override
+    public int getAllPhoneAccountsCount() {
+        try {
+            return mPhoneAccountRegistrar.getAllPhoneAccountsCount();
+        } catch (Exception e) {
+            Log.e(this, e, "getAllPhoneAccountsCount");
+            throw e;
+        }
+    }
+
+    @Override
+    public List<PhoneAccount> getAllPhoneAccounts() {
+        try {
+            return mPhoneAccountRegistrar.getAllPhoneAccounts();
+        } catch (Exception e) {
+            Log.e(this, e, "getAllPhoneAccounts");
+            throw e;
+        }
+    }
+
+    @Override
+    public List<PhoneAccountHandle> getAllPhoneAccountHandles() {
+        try {
+            return mPhoneAccountRegistrar.getAllPhoneAccountHandles();
+        } catch (Exception e) {
+            Log.e(this, e, "getAllPhoneAccounts");
+            throw e;
+        }
+    }
+
+    @Override
     public PhoneAccountHandle getSimCallManager() {
         try {
             return mPhoneAccountRegistrar.getSimCallManager();
@@ -246,7 +276,7 @@
     @Override
     public List<PhoneAccountHandle> getSimCallManagers() {
         try {
-            return mPhoneAccountRegistrar.getAllConnectionManagerPhoneAccounts();
+            return mPhoneAccountRegistrar.getConnectionManagerPhoneAccounts();
         } catch (Exception e) {
             Log.e(this, e, "getSimCallManagers");
             throw e;
@@ -258,10 +288,30 @@
         try {
             enforceModifyPermissionOrCallingPackage(
                     account.getAccountHandle().getComponentName().getPackageName());
-            if (PhoneAccountRegistrar.has(account, PhoneAccount.CAPABILITY_CALL_PROVIDER) ||
-                PhoneAccountRegistrar.has(account, PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+            if (account.hasCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER) ||
+                account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
                 enforceRegisterProviderOrSubscriptionPermission();
             }
+
+            // If the account is marked as enabled or has CAPABILITY_ALWAYS_ENABLED set, check to
+            // ensure the caller has modify permission.  If they do not, set the account to be
+            // disabled and remove CAPABILITY_ALWAYS_ENABLED.
+            if (account.isEnabled() ||
+                    account.hasCapabilities(PhoneAccount.CAPABILITY_ALWAYS_ENABLED)) {
+                try {
+                    enforceModifyPermission();
+                } catch (SecurityException e) {
+                    // Caller does not have modify permission, so change account to disabled by
+                    // default and remove the CAPABILITY_ALWAYS_ENABLED capability.
+                    int capabilities = account.getCapabilities() &
+                            ~PhoneAccount.CAPABILITY_ALWAYS_ENABLED;
+                    account = account.toBuilder()
+                            .setEnabled(false)
+                            .setCapabilities(capabilities)
+                            .build();
+                }
+            }
+
             mPhoneAccountRegistrar.registerPhoneAccount(account);
         } catch (Exception e) {
             Log.e(this, e, "registerPhoneAccount %s", account);
@@ -270,6 +320,17 @@
     }
 
     @Override
+    public void setPhoneAccountEnabled(PhoneAccountHandle account, boolean isEnabled) {
+        try {
+            enforceModifyPermission();
+            mPhoneAccountRegistrar.setPhoneAccountEnabled(account, isEnabled);
+        } catch (Exception e) {
+            Log.e(this, e, "setPhoneAccountEnabled %s %d", account, isEnabled ? 1 : 0);
+            throw e;
+        }
+    }
+
+    @Override
     public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) {
         try {
             enforceModifyPermissionOrCallingPackage(
diff --git a/tests/src/com/android/telecomm/testapps/TestConnectionManager.java b/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
index fdb4285..c34485a 100644
--- a/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
+++ b/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
@@ -16,7 +16,6 @@
 
 package com.android.telecomm.testapps;
 
-import android.app.PendingIntent;
 import android.net.Uri;
 import android.telecomm.AudioState;
 import android.telecomm.Conference;
@@ -27,6 +26,7 @@
 import android.telecomm.RemoteConference;
 import android.telecomm.RemoteConnection;
 import android.telecomm.StatusHints;
+import android.telecomm.VideoProfile;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -80,6 +80,9 @@
 
             @Override
             public void onVideoStateChanged(RemoteConnection connection, int videoState) {
+                if (videoState == VideoProfile.VideoState.BIDIRECTIONAL) {
+                    setVideoProvider(new TestManagedVideoProvider(connection.getVideoProvider()));
+                }
                 setVideoState(videoState);
             }
 
@@ -122,6 +125,7 @@
             mIsIncoming = isIncoming;
             mRemote.addListener(mRemoteListener);
             setState(mRemote.getState());
+            setVideoState(mRemote.getVideoState());
         }
 
         @Override
@@ -266,7 +270,7 @@
         }
     }
 
-    private static void log(String msg) {
+    static void log(String msg) {
         Log.w("telecomtestcs", "[TestConnectionManager] " + msg);
     }
 
@@ -301,6 +305,10 @@
         addConference(new TestManagedConference(remoteConference));
     }
 
+    Map<RemoteConnection, TestManagedConnection> getManagedConnectionByRemote() {
+        return mManagedConnectionByRemote;
+    }
+
     private Connection makeConnection(ConnectionRequest request, boolean incoming) {
         RemoteConnection remote = incoming
                 ? createRemoteIncomingConnection(request.getAccountHandle(), request)
diff --git a/tests/src/com/android/telecomm/testapps/TestConnectionService.java b/tests/src/com/android/telecomm/testapps/TestConnectionService.java
index e221285..186bb5e 100644
--- a/tests/src/com/android/telecomm/testapps/TestConnectionService.java
+++ b/tests/src/com/android/telecomm/testapps/TestConnectionService.java
@@ -28,12 +28,12 @@
 import android.telecomm.Connection;
 import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneCapabilities;
-import android.telecomm.PropertyPresentation;
 import android.telecomm.ConnectionRequest;
 import android.telecomm.ConnectionService;
 import android.telecomm.PhoneAccountHandle;
 import android.telecomm.RemoteConnection;
 import android.telecomm.StatusHints;
+import android.telecomm.TelecommManager;
 import android.telecomm.VideoProfile;
 import android.telephony.DisconnectCause;
 import android.util.Log;
@@ -330,7 +330,7 @@
                     VideoProfile.VideoState.BIDIRECTIONAL :
                     VideoProfile.VideoState.AUDIO_ONLY;
             connection.setVideoState(videoState);
-            connection.setHandle(handle, PropertyPresentation.ALLOWED);
+            connection.setHandle(handle, TelecommManager.PRESENTATION_ALLOWED);
 
             addCall(connection);
 
diff --git a/tests/src/com/android/telecomm/testapps/TestManagedVideoProvider.java b/tests/src/com/android/telecomm/testapps/TestManagedVideoProvider.java
new file mode 100644
index 0000000..9e7b9a1
--- /dev/null
+++ b/tests/src/com/android/telecomm/testapps/TestManagedVideoProvider.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.telecomm.testapps;
+
+import android.telecomm.CameraCapabilities;
+import android.telecomm.Connection;
+import android.telecomm.RemoteConnection;
+import android.telecomm.VideoProfile;
+import android.view.Surface;
+
+public class TestManagedVideoProvider extends Connection.VideoProvider {
+
+    private final RemoteConnection.VideoProvider.Listener mRemoteListener =
+            new RemoteConnection.VideoProvider.Listener() {
+        @Override
+        public void onReceiveSessionModifyRequest(RemoteConnection.VideoProvider rvp,
+                VideoProfile videoProfile) {
+            super.onReceiveSessionModifyRequest(rvp, videoProfile);
+        }
+
+        @Override
+        public void onReceiveSessionModifyResponse(RemoteConnection.VideoProvider rvp,
+        int status,
+        VideoProfile requestedProfile, VideoProfile responseProfile) {
+            super.onReceiveSessionModifyResponse(rvp, status, requestedProfile,
+                    responseProfile);
+        }
+
+        @Override
+        public void onHandleCallSessionEvent(RemoteConnection.VideoProvider rvp, int event) {
+            super.onHandleCallSessionEvent(rvp, event);
+        }
+
+        @Override
+        public void onPeerDimensionsChanged(RemoteConnection.VideoProvider rvp, int width,
+        int height) {
+            super.onPeerDimensionsChanged(rvp, width, height);
+        }
+
+        @Override
+        public void onCallDataUsageChanged(RemoteConnection.VideoProvider rvp, int dataUsage) {
+            super.onCallDataUsageChanged(rvp, dataUsage);
+        }
+
+        @Override
+        public void onCameraCapabilitiesChanged(RemoteConnection.VideoProvider rvp,
+                CameraCapabilities cameraCapabilities) {
+            super.onCameraCapabilitiesChanged(rvp, cameraCapabilities);
+        }
+    };
+
+    private final RemoteConnection.VideoProvider mRemoteVideoProvider;
+
+    public TestManagedVideoProvider(RemoteConnection.VideoProvider remoteVideoProvider) {
+        mRemoteVideoProvider = remoteVideoProvider;
+        mRemoteVideoProvider.addListener(mRemoteListener);
+    }
+
+    @Override
+    public void onSetCamera(String cameraId) {
+        mRemoteVideoProvider.setCamera(cameraId);
+    }
+
+    @Override
+    public void onSetPreviewSurface(Surface surface) {
+        mRemoteVideoProvider.setPreviewSurface(surface);
+    }
+
+    @Override
+    public void onSetDisplaySurface(Surface surface) {
+        mRemoteVideoProvider.setDisplaySurface(surface);
+    }
+
+    @Override
+    public void onSetDeviceOrientation(int rotation) {
+        mRemoteVideoProvider.setDeviceOrientation(rotation);
+    }
+
+    @Override
+    public void onSetZoom(float value) {
+        mRemoteVideoProvider.setZoom(value);
+    }
+
+    @Override
+    public void onSendSessionModifyRequest(VideoProfile requestProfile) {
+        mRemoteVideoProvider.sendSessionModifyRequest(requestProfile);
+    }
+
+    @Override
+    public void onSendSessionModifyResponse(VideoProfile responseProfile) {
+        mRemoteVideoProvider.sendSessionModifyResponse(responseProfile);
+    }
+
+    @Override
+    public void onRequestCameraCapabilities() {
+        mRemoteVideoProvider.requestCameraCapabilities();
+    }
+
+    @Override
+    public void onRequestCallDataUsage() {
+        mRemoteVideoProvider.requestCallDataUsage();
+    }
+
+    @Override
+    public void onSetPauseImage(String uri) {
+        mRemoteVideoProvider.setPauseImage(uri);
+    }
+}
diff --git a/tests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java b/tests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
index 939cdf6..08fa351 100644
--- a/tests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
+++ b/tests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
@@ -47,8 +47,8 @@
     public void setUp() {
         mRegistrar = new PhoneAccountRegistrar(getContext(), FILE_NAME);
         mRegistrar.registerPhoneAccount(PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName("pkg0", "cls0"), "id0"),
-                        "label0")
+                new PhoneAccountHandle(new ComponentName("pkg0", "cls0"), "id0"),
+                "label0")
                 .setAddress(Uri.parse("tel:555-1212"))
                 .setSubscriptionAddress(Uri.parse("tel:555-1212"))
                 .setCapabilities(PhoneAccount.CAPABILITY_CONNECTION_MANAGER)
@@ -56,8 +56,8 @@
                 .setShortDescription("desc0")
                 .build());
         mRegistrar.registerPhoneAccount(PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName("pkg0", "cls0"), "id1"),
-                        "label1")
+                new PhoneAccountHandle(new ComponentName("pkg0", "cls0"), "id1"),
+                "label1")
                 .setAddress(Uri.parse("tel:555-1212"))
                 .setSubscriptionAddress(Uri.parse("tel:555-1212"))
                 .setCapabilities(
@@ -68,8 +68,8 @@
                 .setShortDescription("desc1")
                 .build());
         mRegistrar.registerPhoneAccount(PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName("pkg1", "cls1"), "id2"),
-                        "label2")
+                new PhoneAccountHandle(new ComponentName("pkg1", "cls1"), "id2"),
+                "label2")
                 .setAddress(Uri.parse("tel:555-1212"))
                 .setSubscriptionAddress(Uri.parse("tel:555-1212"))
                 .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
@@ -77,8 +77,8 @@
                 .setShortDescription("desc2")
                 .build());
         mRegistrar.registerPhoneAccount(PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName("sippkg", "sipcls"), "id4"),
-                        "label2")
+                new PhoneAccountHandle(new ComponentName("sippkg", "sipcls"), "id4"),
+                "label2")
                 .setAddress(Uri.parse("sip:test@sip.com"))
                 .setSubscriptionAddress(Uri.parse("test"))
                 .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
@@ -87,8 +87,8 @@
                 .setSupportedUriSchemes(Arrays.asList(PhoneAccount.SCHEME_TEL))
                 .build());
         mRegistrar.registerPhoneAccount(PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName("sippkg", "sipcls"), "id4"),
-                        "label2")
+                new PhoneAccountHandle(new ComponentName("sippkg", "sipcls"), "id4"),
+                "label2")
                 .setAddress(Uri.parse("sip:test@sip.com"))
                 .setSubscriptionAddress(Uri.parse("test"))
                 .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
@@ -207,7 +207,7 @@
 
     public void testAccounts() throws Exception {
         assertEquals(4, mRegistrar.getAllPhoneAccountHandles().size());
-        assertEquals(3, mRegistrar.getOutgoingPhoneAccounts().size());
+        assertEquals(3, mRegistrar.getEnabledPhoneAccounts().size());
         assertEquals(null, mRegistrar.getSimCallManager());
         assertEquals(null, mRegistrar.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL));
     }
@@ -268,8 +268,8 @@
         mRegistrar.unregisterPhoneAccount(
                 new PhoneAccountHandle(new ComponentName("pkg1", "cls1"), "id3"));
         mRegistrar.registerPhoneAccount(PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName("pkg0", "cls0"), "id0"),
-                        "label0")
+                new PhoneAccountHandle(new ComponentName("pkg0", "cls0"), "id0"),
+                "label0")
                 .setAddress(Uri.parse("tel:555-1212"))
                 .setSubscriptionAddress(Uri.parse("tel:555-1212"))
                 .setCapabilities(PhoneAccount.CAPABILITY_CONNECTION_MANAGER)
@@ -281,8 +281,8 @@
 
     private static PhoneAccount makeQuickAccount(String pkg, String cls, String id, int idx) {
         return PhoneAccount.builder(
-                        new PhoneAccountHandle(new ComponentName(pkg, cls), id),
-                        "label" + idx)
+                new PhoneAccountHandle(new ComponentName(pkg, cls), id),
+                "label" + idx)
                 .setAddress(Uri.parse("http://foo.com/" + idx))
                 .setSubscriptionAddress(Uri.parse("tel:555-000" + idx))
                 .setCapabilities(idx)