diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 761f352..c77a1f7 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.dialer.calllog.CallLogListItemView"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/call_log_list_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -160,4 +159,4 @@
               android:layout="@layout/call_log_list_item_extra"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"/>
-</view>
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 773b9e4..551b382 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Vinnige antwoorde"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Oproepinstellings"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Stemboodskapdiens, oproep wat wag en ander"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 54e3379..03a7fe5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ፈጣን ምላሾች"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"የጥሪ ቅንብሮች"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"የድምጽ መልዕክት፣ ጥሪን መጠበቅ፣ እና ሌሎች"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 053ce04..4e9d210 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"الردود السريعة"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"إعدادات الاتصال"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"البريد الصوتي وانتظار المكالمات وغير ذلك"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e66a064..c4bb3c4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Бързи отговори"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Настройки за обаждане"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Гласова поща, изчакващо обаждане и други"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index db4a6a8..27da4cb 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"দ্রুত প্রতিক্রিয়াগুলি"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"কল সেটিংস"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"ভয়েসমেল, কল অপেক্ষমান এবং অন্যান্য"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 15acc43..8201651 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostes ràpides"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Configuració de trucades"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Bústia de veu, trucada en espera i altres"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 39556c2..bb52805 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Rychlé odpovědi"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Nastavení hovorů"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Hlasová schránka, další hovor na lince atd."</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fd0d66c..8c36a43 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hurtigt svar"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Indstillinger for opkald"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Telefonsvarer, ventende opkald og andet"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cf839f5..4debf28 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Kurzantworten"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Anrufeinstellungen"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Mailbox, Anklopfen und weitere Einstellungen"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3cdea0c..90213e1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Γρήγορες απαντήσεις"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Ρυθμίσεις κλήσεων"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Αυτόματος τηλεφωνητής, αναμονή κλήσης και άλλες"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fdf6d12..ad23db4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Quick responses"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Call settings"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, call waiting and others"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index fdf6d12..ad23db4 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Quick responses"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Call settings"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, call waiting and others"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1949200..bba1f28 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respuestas rápidas"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Configuración de llamada"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Buzón de voz, llamada en espera y otros"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ce7ca19..026e679 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respuestas rápidas"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Ajustes de llamada"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Buzón de voz, llamada en espera y otras opciones"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ecff2e6..7a311b2 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Kiirvastused"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Kõneseaded"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Kõnepost, ootel kõne ja muud"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index c2e0d50..a76e5d1 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Erantzun bizkorrak"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Deien ezarpenak"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Erantzungailua, deia zain uzteko eginbidea eta beste batzuk"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index de1c164..2a10863 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"پاسخ‌های سریع"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"تنظیمات تماس"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"پست صوتی، انتظار مکالمه و موارد دیگر"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c36af53..55b1dc3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Pikavastaukset"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Puheluasetukset"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Puhelinvastaaja, odottavat puhelut yms."</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1939bf9..4581199 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Réponses rapides"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Paramètres d\'appel"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Messagerie vocale, appel en attente et autres"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c706837..183d9ab 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Réponses rapides"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Paramètres d\'appel"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Messagerie vocale, appel en attente et autres"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index dd3e23d..0132701 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostas rápidas"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Configuración de chamada"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Correo de voz, chamada en espera e outros"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c5d4dd9..2037535 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"झटपट उत्तर"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"कॉल सेटिंग"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"वॉयस मेल, प्रतीक्षारत कॉल, और अन्य"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d32c306..03cb696 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Brzi odgovori"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Postavke poziva"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Govorna pošta, poziv na čekanju i ostalo"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9fda1f4..d7c5ec9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Gyors válaszok"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Hívásbeállítások"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Hangposta, hívásvárakoztatás és egyebek"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e1c34fd..23307c7 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Արագ պատասխաններ"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Զանգի կարգավորումները"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Ձայնային փոստը, սպասվող զանգը և այլն"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fb5bed0..888c664 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respons cepat"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Setelan panggilan"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Kotak pesan, nada tunggu, dan lainnya"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index f80c880..ad00c1a 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Snarsvör"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Símtalsstillingar"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Talhólf, símtal í bið og annað"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2d47a08..8e9edcb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Risposte rapide"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Impostazioni chiamate"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Segreteria, avviso di chiamata e altre impostazioni"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1702dfd..60a9ddf 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"תגובות מהירות"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"הגדרות שיחה"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"דואר קולי, שיחה ממתינה ואחרים"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9e9b1d6..ba2b79f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"クイック返信"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"通話設定"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"ボイスメール、通話中着信など"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 6f52643..e261801 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"სწრაფი პასუხი"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"ზარის პარამეტრები"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"ხმოვანი ფოსტა, ზარის მოლოდინი და სხვა"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 7d006bc..fd9e284 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Жылдам жауаптар"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Қоңырау параметрлері"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Дауыстық пошта, қоңырауды күту және басқалар"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ba5b00a..00c09d1 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ឆ្លើយតប​រហ័ស"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"កំណត់​ការ​ហៅ"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"សារ​ជា​សំឡេង, រង់ចាំ​ការ​ហៅ និង​ផ្សេងៗ​ទៀត"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 1e5df85..ec380cc 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -130,9 +130,7 @@
     <string name="dialerKeyboardHintText" msgid="5401660096579787344">"ಡಯಲ್‌ ಮಾಡಲು ಕೀಬೋರ್ಡ್‌ ಬಳಸಿ"</string>
     <string name="dialerDialpadHintText" msgid="5824490365898349041">"ಕರೆಯನ್ನು ಸೇರಿಸಲು ಡಯಲ್‌ ಮಾಡಿ"</string>
     <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> ನಿಮಿಷಗಳು <xliff:g id="SECONDS">%s</xliff:g> ಸೆಕೆಂಡುಗಳು"</string>
-    <!-- no translation found for dialog_phone_call_prohibited_message (6554711866586660441) -->
-    <!-- no translation found for dialog_phone_call_prohibited_message (4313552620858880999) -->
-    <skip />
+    <string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"ಕರೆ ಮಾಡಲಾಗಲಿಲ್ಲ."</string>
     <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಲು, ಮೆನು &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳುಗೆ ಹೋಗಿ."</string>
     <!-- no translation found for dialog_voicemail_airplane_mode_message (530922773669546093) -->
     <skip />
@@ -204,4 +202,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"ಧ್ವನಿಮೇಲ್‌, ಕರೆ ನಿರೀಕ್ಷೆ, ಹಾಗೂ ಇತರೆ"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 51013cf..5d70194 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"빠른 응답"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"통화 설정"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"음성사서함, 통화중 대기, 기타"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index bf52e26..184327e 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -249,4 +249,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Тез жооптор"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Чалуу жөндөөлөрү"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Үн почтасы, чалууну күтүү жана башкалар"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index bc99098..fbd0d50 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ການຕອບແບບວ່ອງໄວ"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ໂທ"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"​ຂໍ້​ຄວາມ​ສຽງ, ສາຍ​ຊ້ອນ ແລະ​ອື່ນໆ"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 77492e8..9e8793f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Greiti atsakai"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Skambučių nustatymai"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Balso paštas, laukiamas skambutis ir kt."</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index df73e8f..95df12d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Ātrās atbildes"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Zvanu iestatījumi"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Balss pasts, zvanu gaidīšana un citi"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 7f2dc7a..843a1f1 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Брзи одговори"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Поставки на повик"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Говорна пошта, повик на чекање и други"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index e7f3d71..7ca86b5 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ദ്രുത പ്രതികരണങ്ങൾ"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"കോൾ ക്രമീകരണങ്ങൾ"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"വോയ്‌സ്മെയിൽ, കോൾ വെയ്‌റ്റിംഗ് എന്നിവയും മറ്റുള്ളവയും"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 3d995a9..f0ec72e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Шуурхай хариунууд"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Дуудлагын тохиргоо"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Дуут шуудан, дуудлага хүлээлт болон бусад"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 41b6fb8..2dc3221 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"द्रुत प्रतिसाद"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"कॉल सेटिंग्ज"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"व्हॉइसमेल, कॉल प्रतीक्षा आणि अन्य"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 713f65a..ccc3e0d 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respons pantas"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Tetapan panggilan"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Mel suara, panggilan menunggu dan lain-lain"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index e1607fd..c6b0f06 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"အမြန် တုံ့ပြန်ချက်များ"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"အသံမေးလ်၊ ခေါ်ဆိုမှု စောင့်နိုင်ခြင်း၊ နှင့် အခြားများ"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 889fd87..b45e6c8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hurtigsvar"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Samtaleinnstillinger"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Talepostkasse, samtale venter og mer"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 877eaf0..fa4d6eb 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"द्रुत प्रतिक्रियाहरू"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"कल सेटिङ्"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"भ्वाइस मेल, कल पर्खने, र अन्य"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 74f4eb3..fadee66 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Snelle reacties"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Oproepinstellingen"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, wisselgesprek en overige instellingen"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7a1d991..cc789ce 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Szybkie odpowiedzi"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Ustawienia połączeń"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Poczta głosowa, połączenie oczekujące itp."</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e706554..4955450 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostas rápidas"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Definições de chamadas"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Correio de voz, chamada em espera e outros"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4f25cee..010dd7f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostas rápidas"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Configurações de chamada"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Correio de voz, chamada em espera e outros"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2621c59..66896b5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Răspunsuri rapide"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Setări pentru apeluri"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Mesagerie vocală, apel în așteptare și altele"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a7b4cf4..01cb23c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Быстрые ответы"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Настройки вызовов"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Голосовая почта, ожидание вызова и другие функции"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 8275975..a787bea 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ක්ෂණික ප්‍රතිචාර"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"ඇමතුම් සැකසීම්"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"හඬ තැපෑල , ඇමතුමේ රැඳී සිටීම, සහ වෙනත්"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 38c63d3..e926fc0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Rýchle odpovede"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Nastavenia hovorov"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Hlasová schránka, ďalší hovor na linke atď."</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5af7669..2a3a4eb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hitri odgovori"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Klicne nastavitve"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Odzivnik, čakajoči klic in drugo"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9a2e0cc..93681ae 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Брзи одговори"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Подешавања позива"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Говорна пошта, стављање позива на чекање и друго"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d2fa8f8..f6d8dd3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Snabbsvar"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Samtalsinställningar"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Röstbrevlåda, samtal väntar med flera"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6e84c64..5cdb44e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Majibu ya haraka"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Mipangilio ya kupiga simu"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Ujumbe wa sauti, kusubirisha simu, na mengineyo"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 39bf2d4..892a61e 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"விரைவு பதில்கள்"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"அழைப்பு அமைப்புகள்"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"குரலஞ்சல், அழைப்பு காத்திருப்பு, மேலும் பிற"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 7b44738..3ab6861 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"శీఘ్ర ప్రతిస్పందనలు"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"కాల్ సెట్టింగ్‌లు"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"వాయిస్ మెయిల్, కాల్ నిరీక్షణ మరియు ఇతరం"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 52d1633..bfc439b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"คำตอบด่วน"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"การตั้งค่าการโทร"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"ข้อความเสียง สายเรียกซ้อน และอื่นๆ"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 156468e..f34aeb4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Mga mabilisang tugon"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Mga setting ng tawag"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, call waiting at iba pa"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e81ed1c..feffec9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hızlı yanıtlar"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Çağrı ayarları"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Sesli mesaj, çağrı bekletme ve diğerleri"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d8ca6db..33d06c8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Швидкі відповіді"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Налаштування дзвінків"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Голосова пошта, паралельний виклик та інше"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index f37f992..9b8393e 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"فوری جوابات"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"کال کی ترتیبات"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"صوتی میل، کال کا منتظر اور دیگر"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index ca41f33..f0ee5d2 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Tezkor javoblar"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Qo‘n‘giroq sozlamalari"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Ovozli pochta, qo‘ng‘iroqni kutish va boshqalar"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d33626d..d0d08a2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Trả lời nhanh"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Cài đặt cuộc gọi"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Thư thoại, cuộc gọi chờ và các cài đặt khác"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 47ad52c..2880ba0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回复"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"通话设置"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"语音信箱、来电等待及其他"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a17f294..071c052 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回應"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"通話設定"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"留言信箱、來電待接和其他設定"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c9612b3..dc4e584 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回應"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"通話設定"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"語音信箱、來電插撥和其他設定"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7d1b7aa..26ae11e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -201,4 +201,8 @@
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Izimpendulo ezisheshayo"</string>
     <string name="call_settings_label" msgid="7416182166943714852">"Izilungiselelo zekholi"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"Ivoyisimeyili, ikholi elindile, nokunye"</string>
+    <!-- no translation found for phone_account_settings_label (8298076824934324281) -->
+    <skip />
+    <!-- no translation found for phone_account_settings_description (435745546649702086) -->
+    <skip />
 </resources>
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index bd20d22..50520bb 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -74,10 +74,10 @@
     /** Interface used to inform a parent UI element that a list item has been expanded. */
     public interface CallItemExpandedListener {
         /**
-         * @param view The {@link CallLogListItemView} that represents the item that was clicked
+         * @param view The {@link View} that represents the item that was clicked
          *         on.
          */
-        public void onItemExpanded(CallLogListItemView view);
+        public void onItemExpanded(View view);
 
         /**
          * Retrieves the call log view for the specified call Id.  If the view is not currently
@@ -86,7 +86,7 @@
          * @param callId The call Id.
          * @return The call log view.
          */
-        public CallLogListItemView getViewForCallId(long callId);
+        public View getViewForCallId(long callId);
     }
 
     /** Interface used to initiate a refresh of the content. */
@@ -267,6 +267,7 @@
     private int mCallLogBackgroundColor;
     private int mExpandedBackgroundColor;
     private float mExpandedTranslationZ;
+    private int mPhotoSize;
 
     /** Listener for the primary or secondary actions in the list.
      *  Primary opens the call details.
@@ -286,7 +287,7 @@
     private final View.OnClickListener mExpandCollapseListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            final CallLogListItemView callLogItem = (CallLogListItemView) v.getParent().getParent();
+            final View callLogItem = (View) v.getParent().getParent();
             handleRowExpanded(callLogItem, true /* animate */, false /* forceExpand */);
         }
     };
@@ -296,7 +297,7 @@
         public boolean onRequestSendAccessibilityEvent(ViewGroup host, View child,
                 AccessibilityEvent event) {
             if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) {
-                handleRowExpanded((CallLogListItemView) host, false /* animate */,
+                handleRowExpanded(host, false /* animate */,
                         true /* forceExpand */);
             }
             return super.onRequestSendAccessibilityEvent(host, child, event);
@@ -365,6 +366,7 @@
         mCallLogBackgroundColor = resources.getColor(R.color.background_dialer_list_items);
         mExpandedBackgroundColor = resources.getColor(R.color.call_log_expanded_background_color);
         mExpandedTranslationZ = resources.getDimension(R.dimen.call_log_expanded_translation_z);
+        mPhotoSize = resources.getDimensionPixelSize(R.dimen.contact_photo_size);
 
         mContactPhotoManager = ContactPhotoManager.getInstance(mContext);
         mPhoneNumberHelper = new PhoneNumberDisplayHelper(mContext, resources);
@@ -588,8 +590,7 @@
     @Override
     protected View newChildView(Context context, ViewGroup parent) {
         LayoutInflater inflater = LayoutInflater.from(context);
-        CallLogListItemView view =
-                (CallLogListItemView) inflater.inflate(R.layout.call_log_list_item, parent, false);
+        View view = inflater.inflate(R.layout.call_log_list_item, parent, false);
 
         // Get the views to bind to and cache them.
         CallLogListItemViews views = CallLogListItemViews.fromView(view);
@@ -624,14 +625,13 @@
     /**
      * Binds the views in the entry to the data in the call log.
      *
-     * @param view the view corresponding to this entry
+     * @param callLogItemView the view corresponding to this entry
      * @param c the cursor pointing to the entry in the call log
      * @param count the number of entries in the current item, greater than 1 if it is a group
      */
-    private void bindView(View view, Cursor c, int count) {
-        view.setAccessibilityDelegate(mAccessibilityDelegate);
-        final CallLogListItemView callLogItemView = (CallLogListItemView) view;
-        final CallLogListItemViews views = (CallLogListItemViews) view.getTag();
+    private void bindView(View callLogItemView, Cursor c, int count) {
+        callLogItemView.setAccessibilityDelegate(mAccessibilityDelegate);
+        final CallLogListItemViews views = (CallLogListItemViews) callLogItemView.getTag();
 
         // Default case: an item in the call log.
         views.primaryActionView.setVisibility(View.VISIBLE);
@@ -813,11 +813,11 @@
 
         // Listen for the first draw
         if (mViewTreeObserver == null) {
-            mViewTreeObserver = view.getViewTreeObserver();
+            mViewTreeObserver = callLogItemView.getViewTreeObserver();
             mViewTreeObserver.addOnPreDrawListener(this);
         }
 
-        bindBadge(view, info, details, callType);
+        bindBadge(callLogItemView, info, details, callType);
     }
 
     /**
@@ -886,12 +886,13 @@
     }
 
     /**
-     * Expands or collapses the view containing the CALLBACK, VOICEMAIL and DETAILS action buttons.
+     * Expands or collapses the view containing the CALLBACK/REDIAL, VOICEMAIL and DETAILS action
+     * buttons.
      *
      * @param callLogItem The call log entry parent view.
      * @param isExpanded The new expansion state of the view.
      */
-    private void expandOrCollapseActions(CallLogListItemView callLogItem, boolean isExpanded) {
+    private void expandOrCollapseActions(View callLogItem, boolean isExpanded) {
         final CallLogListItemViews views = (CallLogListItemViews)callLogItem.getTag();
 
         expandVoicemailTranscriptionView(views, isExpanded);
@@ -1234,7 +1235,7 @@
         views.quickContactView.setOverlay(null);
         DefaultImageRequest request = new DefaultImageRequest(displayName, identifier,
                 contactType, true /* isCircular */);
-        mContactPhotoManager.loadDirectoryPhoto(views.quickContactView, photoUri,
+        mContactPhotoManager.loadPhoto(views.quickContactView, photoUri, mPhotoSize,
                 false /* darkTheme */, true /* isCircular */, request);
     }
 
@@ -1386,7 +1387,7 @@
      * @param forceExpand Whether or not to force the call log row into an expanded state regardless
      *        of its previous state
      */
-    private void handleRowExpanded(CallLogListItemView view, boolean animate, boolean forceExpand) {
+    private void handleRowExpanded(View view, boolean animate, boolean forceExpand) {
         final CallLogListItemViews views = (CallLogListItemViews) view.getTag();
 
         if (forceExpand && isExpanded(views.rowId)) {
@@ -1407,7 +1408,7 @@
 
             // Animate the collapse of the previous item if it is still visible on screen.
             if (mPreviouslyExpanded != NONE_EXPANDED) {
-                CallLogListItemView previousItem = mCallItemExpandedListener.getViewForCallId(
+                View previousItem = mCallItemExpandedListener.getViewForCallId(
                         mPreviouslyExpanded);
 
                 if (previousItem != null) {
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index f4db080..dfb7749 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -548,7 +548,7 @@
     }
 
     @Override
-    public void onItemExpanded(final CallLogListItemView view) {
+    public void onItemExpanded(final View view) {
         final int startingHeight = view.getHeight();
         final CallLogListItemViews viewHolder = (CallLogListItemViews) view.getTag();
         final ViewTreeObserver observer = getListView().getViewTreeObserver();
@@ -661,7 +661,7 @@
      * @return The call log view.
      */
     @Override
-    public CallLogListItemView getViewForCallId(long callId) {
+    public View getViewForCallId(long callId) {
         ListView listView = getListView();
 
         int firstPosition = listView.getFirstVisiblePosition();
@@ -673,7 +673,7 @@
             if (view != null) {
                 final CallLogListItemViews viewHolder = (CallLogListItemViews) view.getTag();
                 if (viewHolder != null && viewHolder.rowId == callId) {
-                    return (CallLogListItemView)view;
+                    return view;
                 }
             }
         }
diff --git a/src/com/android/dialer/calllog/CallLogListItemView.java b/src/com/android/dialer/calllog/CallLogListItemView.java
deleted file mode 100644
index b8990f5..0000000
--- a/src/com/android/dialer/calllog/CallLogListItemView.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 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.dialer.calllog;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-
-/**
- * An entry in the call log.
- */
-public class CallLogListItemView extends LinearLayout {
-    public CallLogListItemView(Context context) {
-        super(context);
-    }
-
-    public CallLogListItemView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public CallLogListItemView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-}
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index 4fe638e..78b774b 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -32,7 +32,6 @@
 
 import com.android.dialer.R;
 import com.android.dialer.calllog.CallLogAdapter;
-import com.android.dialer.calllog.CallLogListItemView;
 import com.android.dialer.calllog.CallLogNotificationsHelper;
 import com.android.dialer.calllog.CallLogQueryHandler;
 import com.android.dialer.list.SwipeHelper.OnItemGestureListener;
@@ -266,8 +265,7 @@
                     R.dimen.recent_call_log_item_translation_z);
             view.setTranslationZ(mPreviousTranslationZ);
 
-            final CallLogListItemView callLogItem =
-                    (CallLogListItemView) view.findViewById(R.id.call_log_list_item);
+            final ViewGroup callLogItem = (ViewGroup) view.findViewById(R.id.call_log_list_item);
             // Reset the internal call log item view if it is being recycled
             callLogItem.setTranslationX(0);
             callLogItem.setTranslationY(0);
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index 9cd4d99..10eadff 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -71,7 +71,7 @@
      */
     public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) {
         try {
-            if (Intent.ACTION_CALL.equals(intent.getAction())) {
+            if (Intent.ACTION_CALL.equals(intent.getAction()) && context instanceof Activity) {
                 // All dialer-initiated calls should pass the touch point to the InCallUI
                 Point touchPoint = TouchPointManager.getInstance().getPoint();
                 if (touchPoint.x != 0 || touchPoint.y != 0) {
diff --git a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java
index b7f06d3..9b3e6bc 100644
--- a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java
@@ -21,6 +21,7 @@
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
+import android.widget.LinearLayout;
 
 import com.google.common.collect.Lists;
 
@@ -68,7 +69,7 @@
         mCursor = new MatrixCursor(CallLogQuery._PROJECTION);
         mCursor.moveToFirst();
         // The views into which to store the data.
-        mView = new CallLogListItemView(getContext());
+        mView = new LinearLayout(getContext());
         mView.setTag(CallLogListItemViews.createForTest(getContext()));
     }
 
diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
index e0e111b..b88989d 100644
--- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
@@ -42,6 +42,7 @@
 import com.android.contacts.common.test.FragmentTestActivity;
 import com.android.dialer.CallDetailActivity;
 import com.android.dialer.R;
+import com.android.dialer.util.TestConstants;
 
 import java.util.Date;
 import java.util.Formatter;
@@ -323,7 +324,7 @@
         IntentProvider intentProvider = (IntentProvider) views.callBackButtonView.getTag();
         Intent intent = intentProvider.getIntent(mActivity);
         // Starts a call.
-        assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction());
+        assertEquals(TestConstants.CALL_INTENT_ACTION, intent.getAction());
         // To the entry's number.
         assertEquals(Uri.parse("tel:" + TEST_NUMBER), intent.getData());
     }
@@ -385,7 +386,7 @@
                 Intent callIntent = intentProvider.getIntent(mActivity);
 
                 //The intent should be to make the call
-                assertEquals(Intent.ACTION_CALL_PRIVILEGED, callIntent.getAction());
+                assertEquals(TestConstants.CALL_INTENT_ACTION, callIntent.getAction());
             }
         }
     }
diff --git a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java
index 8d4b01f..6671022 100644
--- a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java
+++ b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java
@@ -35,6 +35,7 @@
 import com.android.contacts.common.test.mocks.MockContentProvider.Query;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.interactions.PhoneNumberInteraction.PhoneItem;
+import com.android.dialer.util.TestConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -179,7 +180,7 @@
         Intent intent = mContext.getIntentForStartActivity();
         assertNotNull(intent);
 
-        assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction());
+        assertEquals(TestConstants.CALL_INTENT_ACTION, intent.getAction());
         assertEquals("tel:123", intent.getDataString());
     }
 
@@ -197,7 +198,7 @@
         Intent intent = mContext.getIntentForStartActivity();
         assertNotNull(intent);
 
-        assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction());
+        assertEquals(TestConstants.CALL_INTENT_ACTION, intent.getAction());
         assertEquals("sip:example%40example.com", intent.getDataString());
     }
 
diff --git a/tests/src/com/android/dialer/util/TestConstants.java b/tests/src/com/android/dialer/util/TestConstants.java
new file mode 100644
index 0000000..780626a
--- /dev/null
+++ b/tests/src/com/android/dialer/util/TestConstants.java
@@ -0,0 +1,7 @@
+package com.android.dialer.util;
+
+import android.content.Intent;
+
+public class TestConstants {
+    public static final String CALL_INTENT_ACTION = Intent.ACTION_CALL;
+}
diff --git a/tests/src/com/android/dialer/widget/ActionBarControllerTest.java b/tests/src/com/android/dialer/widget/ActionBarControllerTest.java
index cafa747..2e38838 100644
--- a/tests/src/com/android/dialer/widget/ActionBarControllerTest.java
+++ b/tests/src/com/android/dialer/widget/ActionBarControllerTest.java
@@ -17,25 +17,53 @@
 package com.android.dialer.widget;
 
 import android.app.ActionBar;
+import android.app.Activity;
 import android.content.Context;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.AndroidTestCase;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.view.View;
 
+import com.android.dialer.DialtactsActivity;
 import com.android.dialer.widget.ActionBarController.ActivityUi;
+import com.android.internal.app.WindowDecorActionBar;
 
 @SmallTest
-public class ActionBarControllerTest extends InstrumentationTestCase {
+public class ActionBarControllerTest extends ActivityInstrumentationTestCase2<DialtactsActivity> {
 
     private static final int ACTION_BAR_HEIGHT = 100;
     private ActionBarController mActionBarController;
     private SearchEditTextLayout mSearchBox;
     private MockActivityUi mActivityUi;
 
+    private class MockActionBar extends WindowDecorActionBar {
+        private int mHideOffset = 0;
+
+        public MockActionBar(Activity activity) {
+            super(activity);
+        }
+
+        @Override
+        public void setHideOffset(int offset) {
+            mHideOffset = offset;
+        }
+
+        @Override
+        public int getHideOffset() {
+            return mHideOffset;
+        }
+    }
+
     private class MockActivityUi implements ActivityUi {
         boolean isInSearchUi;
         boolean hasSearchQuery;
         boolean shouldShowActionBar;
-        int actionBarHideOffset;
+        private ActionBar mActionBar;
+
+        public MockActivityUi() {
+             mActionBar = new MockActionBar(getActivity());
+        }
 
         @Override
         public boolean isInSearchUi() {
@@ -59,7 +87,7 @@
 
         @Override
         public ActionBar getActionBar() {
-            return null;
+            return mActionBar;
         }
     }
 
@@ -83,6 +111,11 @@
         }
     }
 
+    public ActionBarControllerTest() {
+        super(DialtactsActivity.class);
+    }
+
+
     @Override
     protected void setUp() {
         mActivityUi = new MockActivityUi();