diff --git a/InCallUI/res/drawable-hdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6194506..0000000
--- a/InCallUI/res/drawable-hdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png
new file mode 100644
index 0000000..a2177f5
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png
deleted file mode 100644
index 7e7bc3e..0000000
--- a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 185c55b..0000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 844bed3..0000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 38ea395..0000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png
deleted file mode 100644
index 2cbcb5f..0000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index fefee32..0000000
--- a/InCallUI/res/drawable-mdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png
new file mode 100644
index 0000000..7dc920b
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
deleted file mode 100644
index 20ff4b6..0000000
--- a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 470ca27..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png
new file mode 100644
index 0000000..a8becf4
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png
deleted file mode 100644
index a6748d8..0000000
--- a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6fdaa5d..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png
new file mode 100644
index 0000000..baf0cf2
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png
deleted file mode 100644
index 6403ce8..0000000
--- a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml
index b1b5275..ddcd403 100644
--- a/InCallUI/res/layout-land/call_card_content.xml
+++ b/InCallUI/res/layout-land/call_card_content.xml
@@ -43,12 +43,15 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent" >
+
             <!-- Secondary "Call info" block, for the background ("on hold") call. -->
             <include layout="@layout/secondary_call_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom" />
+
         </FrameLayout>
+
     </LinearLayout>
 
     <!-- Contact photo for primary call info -->
@@ -62,6 +65,11 @@
         android:contentDescription="@string/contactPhoto"
         android:src="@drawable/picture_unknown" />
 
+    <include layout="@layout/manage_conference_call_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/photo" />
+
     <fragment android:name="com.android.incallui.VideoCallFragment"
         android:layout_alignParentStart="true"
         android:layout_gravity="start|center_vertical"
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 6b7e17a..aa87d0c 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -40,17 +40,6 @@
     android:animateLayoutChanges="true"
     android:visibility="invisible" >
 
-    <!-- Row 1, the "extra button row": A couple of relatively rare
-         buttons used only in certain call states.
-         Most of the time this whole row is GONE.
-         For now, at least, there's only ever one button visible here
-         at a time, so this can be a simple FrameLayout. -->
-    <include android:id="@+id/extraButtonRow"
-        layout="@layout/extra_button_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <!-- Row 2: The main batch of in-call buttons. -->
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index 605d630..6d0ee88 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/res/layout/call_card_content.xml
@@ -55,6 +55,7 @@
             android:visibility="gone"
             android:padding="@dimen/call_banner_side_padding"
             android:background="@android:color/white" />
+
     </LinearLayout>
 
     <!-- Contact photo for primary call info -->
@@ -96,10 +97,12 @@
     </FrameLayout>
 
     <!-- Secondary "Call info" block, for the background ("on hold") call. -->
-    <include layout="@layout/secondary_call_info"
+    <include layout="@layout/secondary_call_info" />
+
+    <include layout="@layout/manage_conference_call_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"/>
+        android:layout_alignTop="@id/photo" />
 
     <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->
     <FrameLayout
diff --git a/InCallUI/res/layout/extra_button_row.xml b/InCallUI/res/layout/extra_button_row.xml
deleted file mode 100644
index 1bff4c5..0000000
--- a/InCallUI/res/layout/extra_button_row.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/button_background_color">
-    <!-- The buttons here have a text label floating off to the side
-         (which is necessary because these buttons are used only in
-         a few rare states, and the meaning of the icon might not be
-         obvious.)  The entire row (button + text) is clickable. -->
-
-    <!-- "Manage conference" -->
-    <!-- This button is used only on GSM devices, during a conference call. -->
-    <LinearLayout android:id="@+id/manageConferenceButton"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/button_cluster_horizontal_padding"
-        android:paddingEnd="@dimen/button_cluster_horizontal_padding"
-        android:background="?android:attr/selectableItemBackground"
-        android:visibility="gone">
-        <!-- The entire LinearLayout here is clickable, so we don't
-             care about clicks on the ImageButton itself. -->
-        <ImageButton android:id="@+id/manageConferenceButtonImage"
-            android:clickable="false"
-            style="@style/InCallExtraRowButton"
-            android:src="@drawable/ic_groups_holo_dark"
-            android:contentDescription="@string/onscreenManageConferenceText" />
-        <TextView android:id="@+id/manageConferenceButtonLabel"
-            style="@style/InCallExtraRowButtonLabel"
-            android:text="@string/onscreenManageConferenceText" />
-    </LinearLayout>
-
-    <!-- CDMA-specific "Merge" -->
-    <!-- This button is used only on CDMA devices, where we can't use
-         the Merge button in the main button row (because the "Add Call"
-         button might need to be enabled at the same time.) -->
-    <LinearLayout android:id="@+id/cdmaMergeButton"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/button_cluster_horizontal_padding"
-        android:paddingEnd="@dimen/button_cluster_horizontal_padding"
-        android:background="?android:attr/selectableItemBackground"
-        android:visibility="gone">
-        <!-- The entire LinearLayout here is clickable, so we don't
-             care about clicks on the ImageButton itself. -->
-        <ImageButton android:id="@+id/cdmaMergeButtonImage"
-            android:clickable="false"
-            style="@style/InCallExtraRowButton"
-            android:src="@drawable/ic_toolbar_merge"
-            android:contentDescription="@string/onscreenMergeCallsText" />
-        <TextView android:id="@+id/cdmaMergeButtonLabel"
-            style="@style/InCallExtraRowButtonLabel"
-            android:text="@string/onscreenMergeCallsText" />
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml
new file mode 100644
index 0000000..d8ddf21
--- /dev/null
+++ b/InCallUI/res/layout/manage_conference_call_button.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 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
+  -->
+
+<!-- This button is used only on GSM devices, during a conference call. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/manage_conference_call_button"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/call_banner_side_padding"
+    android:paddingEnd="@dimen/secondary_call_banner_right_padding"
+    android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding"
+    android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
+    android:background="@color/incall_banner_secondary_background_color">
+
+    <!-- The entire LinearLayout here is clickable, so we ignore ImageButton clicks. -->
+    <ImageView android:id="@+id/manageConferenceButtonImage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_group_white_24dp"
+        android:tint="@color/incall_banner_secondary_text_color"
+        android:contentDescription="@string/onscreenManageConferenceText" />
+
+    <TextView android:id="@+id/manageConferenceButtonLabel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="24dp"
+        android:gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/incall_banner_secondary_text_color"
+        android:text="@string/onscreenManageConferenceText" />
+
+</LinearLayout>
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index cbe1fa2..237559d 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -27,7 +27,7 @@
     android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding"
     android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
     android:background="@color/incall_banner_secondary_background_color"
-    android:elevation="@dimen/secondary_call_elevation" >
+    android:elevation="@dimen/secondary_call_elevation">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index ad79383..b575fe2 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Voeg oproepe saam"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Ruil"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Bestuur oproepe"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Bestuur konferensie"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Oudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video-oproep"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Verander na stemoproep"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"huts"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"bel"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"terugvee"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Luidsprekerfoon geaktiveer."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Luidsprekerfoon gekies"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Oorstuk gekies"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Bedrade kopstuk gekies"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-kopstuk gekies"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep stilgemaak."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Oproep ontdemp."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Oproep uitgestel."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Oproep uit uitstel verwyder."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Stuur SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Wys af"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Antwoord as video-oproep"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Antwoord as oudio-oproep"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aanvaar videoversoek"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Keur videoversoek af"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Gly op vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Gly links vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Gly regs vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Bestuur konferensie-oproep"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Noodnommer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Kies rekening"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-am/strings.xml b/InCallUI/res/values-am/strings.xml
index 913a0f1..4f50209 100644
--- a/InCallUI/res/values-am/strings.xml
+++ b/InCallUI/res/values-am/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ጥሪዎችን አዋህድ"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ማገላበጥ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ጥሪዎችን አደራጅ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ስብሰባ አደራጅ"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ኦዲዮ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"የቪዲዮ ጥሪ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ወደ ድምጽ ጥሪ ይለውጡ"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ፓውንድ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ደውል"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"የኋሊት ደምሳሽ"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"የስልክ ድምፅ ማጉያ ነቅቷል።"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"የስልክ ድምጽ ማጉያ ተመርጧል"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"የጆሮ ማዳመጫ ተመርጧል"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ባለገመድ ጆሮ ማዳመጫ ተመርጧል"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"የብሉቱዝ ጆሮ ማዳመጫ ተመርጧል"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ጥሪ ፀጥ  ብሏል"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"የጥሪ ድምጸ-ከል ተነስቷል።"</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ጥሪ በይቆይ ላይ ነው"</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"ጥሪ ከይቆይ ተወግዷል።"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"መልስ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS ላክ"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"አትቀበል"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"እንደ ቪዲዮ ጥሪ ይመልሱ"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"እንደ ድምጽ ጥሪ ይመልሱ"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"የቪዲዮ ጥያቄ ተቀበል"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"የቪዲዮ ጥያቄ አትቀበል"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ላይ ያንሸራትቱ።"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ግራ ያንሸራትቱ።"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ቀኝ ያንሸራትቱ።"</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"የስብሰባስልክ ጥሪ አደራጅ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"የአደጋ ጊዜ ቁጥር"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"መለያ ይምረጡ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ar/strings.xml b/InCallUI/res/values-ar/strings.xml
index bd9e9a9..0a476d4 100644
--- a/InCallUI/res/values-ar/strings.xml
+++ b/InCallUI/res/values-ar/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"دمج المكالمات"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تبديل"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"إدارة المكالمات"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"إدارة المؤتمر"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"الصوت"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"مكالمة فيديو"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"التغيير إلى مكالمة صوتية"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"رنين"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"طلب"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"مسافة للخلف"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تم تمكين مكبر صوت الهاتف."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"تم كتم صوت المكالمة."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"رد"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏إرسال رسائل قصيرة SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"رفض"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"الرد بمكالمة فيديو"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"الرد بمكالمة صوتية"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"قبول طلب الفيديو"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"رفض طلب الفيديو"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"تمرير لأعلى لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"تمرير لليسار لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"تمرير لليمين لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"إدارة مكالمة جماعية"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"رقم الطوارئ"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"تحديد الحساب"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"٤"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index 2c2b5b6..1e969a3 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обединяване на обаждания"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Размяна"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управление на обажданията"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Упр. на конференция"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видеообаждане"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Преминаване към гласово обаждане"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"диез"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набиране"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Високоговорителят бе активиран."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Обаждането бе спряно."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Отговор"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Изпращане на SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Отхвърлям"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Приемане като видеообаждане"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Приемане като аудиообаждане"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Приемане на заявката за видеовръзка"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Отхвърляне на заявката за видеовръзка"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Плъзнете нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Плъзнете наляво за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Плъзнете надясно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управление на конферентно обаждане"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Спешен номер"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Избиране на профил"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml
index ec8d856..5173a0a 100644
--- a/InCallUI/res/values-bn-rBD/strings.xml
+++ b/InCallUI/res/values-bn-rBD/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"কলগুলি মার্জ করুন"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"সোয়াপ করুন"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"কলগুলি পরিচালনা করুন"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"কনফারেন্স পরিচালনা করুন"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"অডিও"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ভিডিও কল"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ভয়েস কলে পরিবর্তন করুন"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"পাউন্ড"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ডায়াল করুন"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ব্যাক-স্পেস"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"স্পীকারফোন সক্ষম করা আছে৷"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"স্পিকারফোন নির্বাচন করা হয়েছে"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ইয়ারপিস নির্বাচন করা হয়েছে"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"তারযুক্ত হেডসেট নির্বাচন করা হয়েছে"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth হেডসেট নির্বাচন করা হয়েছে"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"কল নিঃশব্দ করা আছে৷"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"কল সশব্দ করা হয়েছে।"</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"কলটি সাময়িকভাবে স্থগিত রাখা হয়েছে।"</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"সাময়িকভাবে স্থগিত রাখা অবস্থা থেকে কলটি সরানো হয়েছে।"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"উত্তর"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS পাঠান"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"অস্বীকার করুন"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"ভিডিও কল হিসেবে উত্তর দিন"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ভিডিওর অনুরোধ গ্রহণ করুন"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ভিডিওর অনুরোধ প্রত্যাখ্যান করুন"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য উপরের দিকে স্লাইড করুন৷"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য বাম দিকে স্লাইড করুন৷"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য ডান দিকে স্লাইড করুন৷"</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"কনফারেন্স কল পরিচালনা করুন"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"জরুরি নম্বর"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"অ্যাকাউন্ট নির্বাচন করুন"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"০"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"১"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"২"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"৩"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"৪"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"৫"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"৬"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"৭"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"৮"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"৯"</string>
 </resources>
diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index 1ad2a5f..ee99318 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combina les trucades"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Canvia"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestiona les trucades"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestiona conferència"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Àudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videotrucada"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Canvia a trucada"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"coixinet"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marca"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retrocés"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altaveu activat."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Trucada silenciada."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Resposta"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envia SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rebutja"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Respon amb una trucada de vídeo."</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Respon amb una trucada d\'àudio."</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accepta la sol·licitud de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rebutja la sol·licitud de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Fes lliscar el dit cap amunt per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Fes lliscar el dit cap a l\'esquerra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Fes lliscar el dit cap a la dreta per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestiona la trucada de conferència"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número d\'emergència"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Selecció d\'un compte"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index 227ea9b..df90279 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spojit hovory"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zaměnit"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Spravovat hovory"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Spravovat konferenci"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohovor"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Změnit na hlasové volání"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčení"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Reproduktor je zapnutý."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Hovor ztlumen."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Odpověď"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Odeslat SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odmítnout"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Přijmout jako videohovor"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Přijmout jako hlasový hovor"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Přijmout žádost o videhovor"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odmítnout žádost o videohovor"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Přejeďte prstem nahoru: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Přejeďte prstem doleva: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Přejeďte prstem doprava: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Spravovat konferenční hovor"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Číslo tísňové linky"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Výběr účtu"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml
index 157bc2f..06cb9ab 100644
--- a/InCallUI/res/values-da/strings.xml
+++ b/InCallUI/res/values-da/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Slå opkald sammen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Skift"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrer opkald"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Admin. konference"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Lyd"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videoopkald"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Skift til stemmeopkald"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pund"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring op"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"tilbage"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Højttalertelefon aktiveret."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Højttalertelefon blev valgt"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Højttaler blev valgt"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Headset med kabel blev valgt"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-headset er valgt"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Lyd slået fra opkald."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Lyden for opkaldet blev slået til."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Opkaldet er sat i venteposition."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Opkaldet blev fjernet fra venteposition."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send sms"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Afvis"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Besvar som videoopkald"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Besvar som lydopkald"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acceptér videoanmodning"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Afvis videoanmodning"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Skub op for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Skub til venstre for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Skub til højre for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer telefonmøde"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nødnummer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Vælg konto"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index b224914..f9bcc7d 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Anrufe verbinden"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wechseln"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Anrufe verwalten"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferenz verwalten"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videoanruf"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Zu Sprachanruf wechseln"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"Pfund"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Wählen"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Rücktaste"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Freisprechfunktion aktiviert"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Freisprechfunktion ausgewählt"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Kopfhörer ausgewählt"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Kabelheadset ausgewählt"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-Headset ausgewählt"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Anruf stummgeschaltet"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Stummschaltung des Anrufs aufgehoben"</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Anruf wird gehalten."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Anruf wird nicht mehr gehalten."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antworten"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS senden"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Ablehnen"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Antworten mit Videoanruf"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Antworten mit Audioanruf"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Videoanfrage akzeptieren"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Videoanfrage ablehnen"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach oben schieben"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach links schieben"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach rechts schieben"</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonkonferenz verwalten"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Notrufnummer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Konto auswählen"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-el/strings.xml b/InCallUI/res/values-el/strings.xml
index af6c211..3a1517d 100644
--- a/InCallUI/res/values-el/strings.xml
+++ b/InCallUI/res/values-el/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Συγχώνευση κλήσεων"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Ανταλλαγή"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Διαχείριση κλήσεων"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Διαχείρ. συνεδρίασης"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ήχος"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Κλήση βίντεο"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Αλλαγή σε φωνητική κλήση"</string>
@@ -161,8 +162,14 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"σύμβολο δίεσης"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"κλήση"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Η ανοικτή συνομιλία ενεργοποιήθηκε."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Επιλέχθηκε ανοικτή ακρόαση"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Επιλέχθηκε ακουστικό τηλεφώνου"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Επιλέχθηκαν ενσύρματα ακουστικά"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Επιλέχθηκε ακουστικό Bluetooth"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Η κλήση τέθηκε σε σίγαση."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Καταργήθηκε η σίγαση κλήσης."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Η κλήση είναι σε αναμονή."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Η κλήση δεν είναι πλέον σε αναμονή."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Απάντηση"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Αποστολή SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Απόρριψη"</string>
@@ -185,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Διαχείριση κλήσης συνδιάσκεψης"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Αριθμός έκτακτης ανάγκης"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Επιλογή λογαριασμού"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-en-rGB/strings.xml b/InCallUI/res/values-en-rGB/strings.xml
index f6c20ef..28c3c33 100644
--- a/InCallUI/res/values-en-rGB/strings.xml
+++ b/InCallUI/res/values-en-rGB/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Manage calls"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Manage conference"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Change to voice call"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Speakerphone enabled."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Call muted."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Answer as video call"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Answer as audio call"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accept video request"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Decline video request"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slide up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slide left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slide right for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Emergency number"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Select Account"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-en-rIN/strings.xml b/InCallUI/res/values-en-rIN/strings.xml
index f6c20ef..28c3c33 100644
--- a/InCallUI/res/values-en-rIN/strings.xml
+++ b/InCallUI/res/values-en-rIN/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Manage calls"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Manage conference"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Change to voice call"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Speakerphone enabled."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Call muted."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Answer as video call"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Answer as audio call"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accept video request"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Decline video request"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slide up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slide left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slide right for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Emergency number"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Select Account"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml
index 40d165d..3829486 100644
--- a/InCallUI/res/values-es-rUS/strings.xml
+++ b/InCallUI/res/values-es-rUS/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combinar llamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrar llamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Administ conferencia"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videollamada"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Cambiar a llamada de voz"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"numeral"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altavoz habilitado"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Altavoz seleccionado"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular seleccionado"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auriculares con cable seleccionados"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auriculares Bluetooth seleccionados"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Llamada silenciada"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Llamada con sonido activado"</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Llamada en espera"</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Llamada recuperada"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar un mensaje SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videollamada"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como llamada de audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceptar solicitud de video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rechazar solicitud de video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Deslízate hacia arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Deslízate hacia la izquierda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Deslízate hacia la derecha para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrar conferencia telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergencia"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Seleccionar cuenta"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index 7e74cc4..809a181 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Llamada a tres"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrar llamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Administrar conferencia"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videollamada"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Cambiar a llamada de voz"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retroceder un espacio"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altavoz habilitado"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Altavoz seleccionado"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular seleccionado"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auriculares con cable seleccionados"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auriculares Bluetooth seleccionados"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Llamada silenciada"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Llamada silenciada."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Llamada en espera."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Llamada recuperada."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videollamada"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como llamada de audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceptar solicitud de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rechazar solicitud de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Desliza el dedo hacia arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Desliza el dedo hacia la izquierda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Desliza el dedo hacia la derecha para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrar conferencia telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergencia"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Seleccionar cuenta"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-et-rEE/strings.xml b/InCallUI/res/values-et-rEE/strings.xml
index 67bbda6..de36347 100644
--- a/InCallUI/res/values-et-rEE/strings.xml
+++ b/InCallUI/res/values-et-rEE/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Ühenda kõned"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Vaheta"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Halda kõnesid"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Halda konverentsi"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Heli"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videokõne"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mine üle häälkõnele"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"nael"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"helista"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"tagasilüke"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Valjuhääldi on sisse lülitatud."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Kõne on summutatud."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Vastamine"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-i saatmine"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Keeldumine"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Vastamine videokõnena"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Vastamine helikõnena"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Võta videotaotlus vastu"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Lükka videotaotlus tagasi"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Lohistage üles <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Lohistage vasakule <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Lohistage paremale <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konverentskõne haldamine"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Hädaabinumber"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Konto valimine"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-eu-rES/strings.xml b/InCallUI/res/values-eu-rES/strings.xml
index 6e6013f..cb7a87b 100644
--- a/InCallUI/res/values-eu-rES/strings.xml
+++ b/InCallUI/res/values-eu-rES/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Bateratu deiak"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trukatu"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Kudeatu deiak"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Kudeatu konferentzia"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audioa"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Bideo-deia"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Aldatu ahots-deira"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"markatu"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"atzera tekla"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Bozgorailua gaitu da."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Deiaren audioa desaktibatu da."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Erantzun"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Bidali SMS mezua"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Baztertu"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Erantzun bideo-dei moduan"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Erantzun audio-dei moduan"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Onartu bideo-eskaera"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Ukatu bideo-eskaera"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Lerratu gora hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Lerratu ezkerrera hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Lerratu eskuinera hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Kudeatu konferentzia-deia"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Larrialdietarako zenbakia"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Hautatu kontua"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml
index caf8ba1..fcef683 100644
--- a/InCallUI/res/values-fa/strings.xml
+++ b/InCallUI/res/values-fa/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ادغام تماس‌ها"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تعویض"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"مدیریت تماس‌ها"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"مدیریت کنفرانس"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"صوتی"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"تماس ویدیویی"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"تغییر به تماس صوتی"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"پوند"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"شماره گیری"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تلفن آیفون‌دار فعال شد."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"بلندگو انتخاب شد"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"گوشی انتخاب شد"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"هدست سیم‌دار انتخاب شد"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"هدست بلوتوث انتخاب شد"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"تماس نادیده گرفته شد."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"صدای تماس وصل شد."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"تماس در حالت انتظار نگه داشته شد."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"تماس از حالت انتظار برداشته شد."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"پاسخ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ارسال پیامک"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"عدم پذیرش"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"پاسخ به صورت تماس ویدیویی"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"پاسخ به صورت تماس صوتی"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"پذیرش درخواست ویدیو"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"رد کردن درخواست ویدیو"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به بالا بلغزانید."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به چپ بلغزانید."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به راست بلغزانید."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"مدیریت تماس کنفرانس"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"شماره اضطراری"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"انتخاب حساب"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"۰"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"۱"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"۲"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"۳"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"۴"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"۵"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"۶"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"۷"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"۸"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"۹"</string>
 </resources>
diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml
index 7671e6e..754a89b 100644
--- a/InCallUI/res/values-fi/strings.xml
+++ b/InCallUI/res/values-fi/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Yhdistä puhelut"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Vaihda"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Hallinnoi puheluita"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Puhelinneuvottelu"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ääni"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videopuh."</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Muuta äänipuheluksi"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"punta"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"soita"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"askelpalautin"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kaiutin käytössä."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Puhelu mykistetty."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Vastaa"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Lähetä tekstiviesti"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Hylkää"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Vastaa ja aloita videopuhelu"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Vastaa ja aloita äänipuhelu"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Hyväksy videopyyntö"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Hylkää videopyyntö"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla ylös."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla vasemmalle."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla oikealle."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Hallinnoi puhelinneuvottelua"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Hätänumero"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Valitse tili"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-fr-rCA/strings.xml b/InCallUI/res/values-fr-rCA/strings.xml
index 4e1792a..ff6445f 100644
--- a/InCallUI/res/values-fr-rCA/strings.xml
+++ b/InCallUI/res/values-fr-rCA/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusionner les appels"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Permuter"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gérer les appels"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gérer la conférence"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Appel vidéo"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Passer à un appel vocal"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"dièse"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Haut-parleur activé"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Haut-parleur sélectionné"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Écouteur sélectionné"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Écouteurs à câble sélectionnés"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Écouteurs Bluetooth sélectionnés"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Son coupé"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Le son de l\'appareil a été réactivé."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"L\'appel a été mis en attente."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"L\'appel a été rétabli."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Répondre"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un message texte"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Répondre comme appel vidéo"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Répondre comme appel audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accepter la demande d\'appel vidéo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Refuser la demande d\'appel vidéo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Faites glisser votre doigt vers le haut pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Faites glisser votre doigt vers la gauche pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Faites glisser votre doigt vers la droite pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gérer la conférence téléphonique"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numéro d\'urgence"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Sélectionnez un compte"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index c2330e1..8674f16 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusionner les appels"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Permuter"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gérer les appels"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gérer la conférence"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Appel vidéo"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Passer à un appel vocal"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"dièse"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Haut-parleur activé"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Son coupé"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Réponse"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Répondre via un appel vidéo"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Répondre via un appel audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accepter la demande d\'appel vidéo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Refuser la demande d\'appel vidéo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Faites glisser votre doigt vers le haut pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Faites glisser votre doigt vers la gauche pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Faites glisser votre doigt vers la droite pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gérer la conférence téléphonique"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numéro d\'urgence"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Sélectionner un compte"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-gl-rES/strings.xml b/InCallUI/res/values-gl-rES/strings.xml
index d2d79dd..633e0db 100644
--- a/InCallUI/res/values-gl-rES/strings.xml
+++ b/InCallUI/res/values-gl-rES/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combinar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Xestionar chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Xestión conferencia"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochamada"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Cambiar para chamada de voz"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altofalante activado"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Seleccionouse o altofalante"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Seleccionouse o auricular"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Seleccionáronse os auriculares con fíos"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Seleccionáronse os auriculares de Bluetooth"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada silenciada"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Chamada con son activado."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chamada en espera."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Cancelouse a chamara en espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rexeitar"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videochamada"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como chamada de audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acepta a solicitude de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rexeita a solicitude de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Pasa o dedo cara arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Pasa o dedo cara a esquerda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Pasa o dedo cara a dereita para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Xestionar conferencia telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emerxencia"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Seleccionar conta"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 53caf34..771be9f 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कॉल मर्ज करें"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"स्वैप करें"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"कॉल प्रबंधित करें"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"कॉन्फ़्रेंस प्रबंधित करें"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ऑडियो"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"वीडियो कॉल"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ध्वनि कॉल में बदलें"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"पाउंड"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल करें"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"बैकस्पेस"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्‍पीकरफ़ोन सक्षम."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"कॉल म्‍यूट की गई."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS भेजें"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार करें"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"वीडियो कॉल के रूप में उत्तर दें"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ऑडियो कॉल के रूप में उत्तर दें"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"वीडियो अनुरोध स्‍वीकार करें"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"वीडियो अनुरोध अस्‍वीकार करें"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए ऊपर स्‍लाइड करें."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए बाएं स्‍लाइड करें."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए दाएं स्‍लाइड करें."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आपातकालीन नंबर"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"खाता चुनें"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index 93fd39f..ca85c42 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spoji pozive"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamijeni"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Upravljaj pozivima"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Upravljanje konferencijom"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videopoziv"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Prijeđi na glasovni poziv"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"funta"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"biraj"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Zvučnik je omogućen."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvuk poziva isključen."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošalji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odbij"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Prihvati kao videopoziv"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Prihvati kao audiopoziv"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Prihvati zahtjev za videozapis"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odbij zahtjev za videozapis"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Kliznite prema gore za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Kliznite lijevo za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Kliznite desno za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljanje konferencijskim pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Broj hitne službe"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Odaberite račun"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index acc2247..6f0648b 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hívások egyesítése"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Csere"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Hívások kezelése"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferencia kezelése"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Hang"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohívás"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Váltás hanghívásra"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"kettős kereszt"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"tárcsázás"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kihangosítás engedélyezve."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Hívás némítva."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Fogadás"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS küldése"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Elutasítás"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Fogadás videohívásként"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Fogadás hanghívásként"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Videó kérésének elfogadása"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Videó kérésének elutasítása"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa felfelé."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa balra."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa jobbra."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferenciahívás kezelése"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Segélyhívó szám"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Fiók kiválasztása"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index f24fc63..d2a1f1d 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Միավորել զանգերը"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Փոխանակել"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Կառավարել զանգերը"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Կառավարել կոնֆերանսը"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ձայնանյութ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Տեսազանգել"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Փոխարկել ձայնային կանչի"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ֆունտ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"համարհավաքել"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"հետշարժ"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Բարձրախոսը միացված է:"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Զանգը խլացված է:"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Պատասխանել"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Ուղարկել SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Մերժել"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Պատասխանել տեսազանգով"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Պատասխանել ձայնային զանգով"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Ընդունել տեսանյութի հարցումը"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Մերժել տեսանյութի հարցումը"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Սահեցրեք վերև` <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Սահեցրեք ձախ` <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Սահեցրեք աջ` <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Կառավարեք կոնֆերանս զանգը"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Արտակարգ իրավիճակների հեռախոսահամար"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Ընտրեք հաշիվ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index 48338ea..f47efb6 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabungkan panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Tukar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Kelola panggilan"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Kelola konferensi"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Ubah ke panggilan suara"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"panggil"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Pengeras suara ponsel diaktifkan."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan disenyapkan."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Menjawab"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Mengirim SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Menolak"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Menjawab sebagai video call"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Menjawab sebagai panggilan audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Terima permintaan video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tolak permintaan video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Geser ke atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Geser ke kiri untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Geser ke kanan untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Kelola penggilan telewicara"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nomor darurat"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Pilih Akun"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-is-rIS/strings.xml b/InCallUI/res/values-is-rIS/strings.xml
index 5d8a8b2..cc0a74f 100644
--- a/InCallUI/res/values-is-rIS/strings.xml
+++ b/InCallUI/res/values-is-rIS/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sameina símtöl"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Skipta milli"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Stjórna símtölum"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Stjórna símafundi"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Hljóð"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Myndsímtal"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Breyta í símtal"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"kassi"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"hringja"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"bakklykill"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kveikt á hátalara."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Hátalari valinn"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Heyrnartól valin"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Höfuðtól með snúru valin"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-höfuðtól valin"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Símtal þaggað."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Kveikt á hljóði í símtali."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Símtal sett í bið."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Símtal tekið úr bið."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Senda SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Hafna"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Svara sem myndsímtali"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Svara sem símtali"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Samþykkja beiðni um myndsímtal"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Hafna beiðni um myndsímtal"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Strjúktu upp til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Strjúktu til vinstri til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Strjúktu til hægri til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Stjórna símafundi"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Neyðarnúmer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Velja reikning"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-it/strings.xml b/InCallUI/res/values-it/strings.xml
index b395290..498065d 100644
--- a/InCallUI/res/values-it/strings.xml
+++ b/InCallUI/res/values-it/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Unisci"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Scambia"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestisci chiamate"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestisci conferenza"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochiam."</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Imposta chiamata vocale"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"sterlina"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"componi"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Vivavoce attivo."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Vivavoce selezionato"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricolari selezionati"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auricolari con cavo selezionati"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auricolari Bluetooth selezionati"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Chiamata disattivata."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Audio chiamata riattivato."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chiamata messa in attesa."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Chiamata ripresa."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Rispondi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Invia SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rifiuta"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Rispondi con videochiamata"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Rispondi con chiamata audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accetta richiesta video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rifiuta richiesta video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Scorri verso l\'alto per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Scorri verso sinistra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Scorri verso destra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestisci audioconferenza"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numero di emergenza"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Seleziona account"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-iw/strings.xml b/InCallUI/res/values-iw/strings.xml
index 5dd31d0..f8d9186 100644
--- a/InCallUI/res/values-iw/strings.xml
+++ b/InCallUI/res/values-iw/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"מזג שיחות"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"החלף"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"נהל שיחות"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"נהל ועידה"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"אודיו"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"שיחת וידאו"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"שנה לשיחה קולית"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"סולמית"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"חייג"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"רמקול מופעל."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"שיחה מושתקת."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"ענה"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏שלח SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"דחה"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"ענה כשיחת וידאו"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ענה כשיחת אודיו"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"קבל בקשת וידאו"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"דחה בקשת וידאו"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"הסט למעלה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"הסט שמאלה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"הסט ימינה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"נהל שיחת ועידה"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"מספר חירום"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"בחר חשבון"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml
index 2281fe5..2c44371 100644
--- a/InCallUI/res/values-ja/strings.xml
+++ b/InCallUI/res/values-ja/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"グループ通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切り替え"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"通話の管理"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"グループ通話の管理"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"音声"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ビデオハングアウト"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"音声通話に変更"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ポンド"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"発信"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"バックスペース"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"スピーカーが有効です。"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"通話がミュートされています。"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"電話に出る"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMSを送信"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"着信拒否"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"ビデオハングアウトで電話に出る"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"音声通話で電話に出る"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ビデオ通話のリクエストを承諾する"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ビデオ通話のリクエストを拒否する"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"上にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"左にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"右にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"グループ通話オプション"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急通報番号"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"アカウントの選択"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 8486963..da46f52 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ზარების გაერთიანება"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"შენაცვლება"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ზარების მართვა"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"კონფერენციის მართვა"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"აუდიო"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ვიდეოზარი"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"აუდიო ზარზე გადართვა"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"დიეზი"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"დარეკვა"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"უკუშლა"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"სპიკერები ჩართულია."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ზარი დადუმებულია."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"პასუხი"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-ის გაგზავნა"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"უარყოფა"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"პასუხი ვიდეოზარის სახით"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"პასუხი აუდიო ზარის სახით"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ვიდეოს მოთხოვნის მიღება"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ვიდეოს მოთხოვნის უარყოფა"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"გაასრიალეთ ზემოთ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისთვის."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისათვის გაასრიალეთ მარცხნივ."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისათვის გაასრიალეთ მარჯვნივ."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"საკონფერენციო ზარის მართვა"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"გადაუდებელი დახმარების ნომერი"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"ანგარიშის არჩევა"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml
index db2dea5..e21645c 100644
--- a/InCallUI/res/values-km-rKH/strings.xml
+++ b/InCallUI/res/values-km-rKH/strings.xml
@@ -43,7 +43,7 @@
     <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"លេខ​មិន​ត្រឹមត្រូវ"</string>
     <string name="confCall" msgid="1904840547188336828">"ការ​ហៅ​ជា​សន្និសីទ"</string>
     <string name="call_lost" msgid="317670617901479594">"បាត់បង់​ការ​ហៅ។"</string>
-    <string name="ok" msgid="3811371167865772377">"យល់​ព្រម"</string>
+    <string name="ok" msgid="3811371167865772377">"យល់​ព្រម​"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"អូប៉ាល័រ"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"កាស"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"កាស​មាន​ខ្សែ"</string>
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"បញ្ចូល​ការ​ហៅ​រួម​​គ្នា"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ប្ដូរ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"គ្រប់គ្រង​ការ​ហៅ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"គ្រប់គ្រង​សន្និសីទ"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"សំឡេង"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ហៅ​ជា​វីដេអូ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ប្ដូរ​ទៅ​ការ​ហៅ​ជា​សំឡេង"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ផោន"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ចុច"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"លុប​ថយក្រោយ"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"បាន​បើក​អូប៉ាល័រ​ទូរស័ព្ទ។"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ការ​ហៅ​បិទ​សំឡេង។"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"ឆ្លើយតប"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ផ្ញើ​សារ SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"បដិសេធ"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"ឆ្លើយតប​ជា​ការ​ហៅ​ជា​​វីដេអូ"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ឆ្លើយតប​ជា​ការ​ហៅ​ជា​សំឡេង"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ទទួលយក​សំណើ​វីដេអូ"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ទទួលយក​សំណើ​វីដេអូ"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"រុញ​ឡើង​លើ​ដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"រុញ​ទៅ​ឆ្វេង​ដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"រុញ​​ទៅ​ស្ដាំ​ដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"គ្រប់គ្រង​ការ​ហៅ​​ជា​សន្និសីទ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"លេខ​ពេល​អាសន្ន"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"ជ្រើស​គណនី"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml
index eb2aad6..c8e2e59 100644
--- a/InCallUI/res/values-kn-rIN/strings.xml
+++ b/InCallUI/res/values-kn-rIN/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ಕರೆಗಳನ್ನು ವಿಲೀನಗೊಳಿಸು"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ಸ್ವ್ಯಾಪ್‌ ಮಾಡು"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ಕರೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ಕಾನ್ಫರೆನ್ಸ್ ನಿರ್ವಹಿಸಿ"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ಆಡಿಯೊ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ಧ್ವನಿ ಕರೆಗೆ ಬದಲಾಯಿಸಿ"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ಪೌಂಡ್"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ಡಯಲ್"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ಸ್ಪೀಕರ್‌ಫೋನ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"ಸ್ಪೀಕರ್‌ಫೋನ್ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ಇಯರ್‌ಪೀಸ್ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ವೈರ್‌ನ ಹೆಡ್‌ಸೆಟ್ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ಕರೆಯನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ಕರೆಯನ್ನು ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ಕರೆಯನ್ನು ತಡೆಹಿಡಿಯಲಾಗಿದೆ."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"ಕರೆಯ ತಡೆಯನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ಉತ್ತರ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS ಕಳುಹಿಸು"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ನಿರಾಕರಿಸು"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"ವೀಡಿಯೊ ಕರೆ ರೂಪದಲ್ಲಿ ಉತ್ತರಿಸಿ"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ವೀಡಿಯೊ ವಿನಂತಿ ಒಪ್ಪಿಕೊಳ್ಳು"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ವೀಡಿಯೊ ವಿನಂತಿ ತಿರಸ್ಕರಿಸು"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಮೇಲಕ್ಕೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಎಡಕ್ಕೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಬಲಗಡೆಗೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"ತುರ್ತು ಸಂಖ್ಯೆ"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"ಖಾತೆ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ko/strings.xml b/InCallUI/res/values-ko/strings.xml
index cdb2fd3..916ac49 100644
--- a/InCallUI/res/values-ko/strings.xml
+++ b/InCallUI/res/values-ko/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"통화 병합"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"전환"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"통화 관리"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"다자간 통화 관리"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"오디오"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"화상 통화"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"음성 통화로 변경"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"파운드"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"전화걸기"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"백스페이스"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"스피커폰이 사용 설정되었습니다."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"통화가 음소거되었습니다."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"답변"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS 보내기"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"거부"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"화상 통화로 받기"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"음성 전화로 받기"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"동영상 요청 수락"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"동영상 요청 거절"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 위로 슬라이드합니다."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 왼쪽으로 슬라이드합니다."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 오른쪽으로 슬라이드합니다."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"다자간 통화 관리"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"비상 전화번호"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"계정 선택"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-lo-rLA/strings.xml b/InCallUI/res/values-lo-rLA/strings.xml
index fae6afd..3ed7f2f 100644
--- a/InCallUI/res/values-lo-rLA/strings.xml
+++ b/InCallUI/res/values-lo-rLA/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ຮວມສາຍ"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ສະລັບ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ຈັດການການໂທ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ຈັດການການປະຊຸມສາຍ"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ສຽງ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ໂທແບບເຫັນໜ້າ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ປ່ຽນ​ເປັນ​ການ​ໂທ​ດ້ວຍ​ສຽງ"</string>
@@ -161,8 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ພາວ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ປຸ່ມໂທ"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ປຸ່ມ backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ເປີດລຳໂພງແລ້ວ."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ປິດສຽງການໂທແລ້ວ."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"ຄໍາ​ຕອບ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ສົ່ງ SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ປະຕິເສດ"</string>
@@ -185,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"ຈັດການການປະຊຸມສາຍ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"ເບີໂທສຸກເສີນ"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"ເລືອກ​ບັນ​ຊີ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index 0c64157..4986a98 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sujungti skambučius"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Apkeisti"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Valdyti skambučius"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Valdyti konferenciją"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Garso įr."</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Vaizdo sk."</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Pakeisti į balso skambutį"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"svaras"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"rinkti numerį"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"naikinimo klavišas"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Garsiakalbis įgalintas."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Skambutis nutildytas."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Atsakyti"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Siųsti SMS pranešimą"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Atmesti"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Atsiliepti kaip į vaizdo skambutį"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Atsiliepti kaip į garso skambutį"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Priimti vaizdo įrašo užklausą"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Atmesti vaizdo įrašo užklausą"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slyskite aukštyn link parinkties „<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>“."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slyskite į kairę link parinkties „<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>“."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slyskite į dešinę link parinkties „<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>“."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Valdyti konferencinį skambutį"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Pagalbos numeris"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Pasirinkite paskyrą"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index 0666998..30acedc 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sapludināt zvanus"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Mainīt"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Pārvaldīt zvanus"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Pārvaldīt konferenci"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videozvans"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mainīt uz balss zvanu"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"cipara simbols"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"sastādīt numuru"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"atpakaļatkāpe"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Skaļrunis ir iespējots."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvana skaņa ir izslēgta."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Atbildēt"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Sūtīt īsziņu"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Noraidīt"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Atbildēt videozvanā"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Atbildēt audiozvanā"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Pieņemt video pieprasījumu"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Noraidīt video pieprasījumu"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Velciet uz augšu, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Velciet pa kreisi, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Velciet pa labi, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Pārvaldīt konferences zvanu"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Ārkārtas numurs"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Konta atlase"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml
index e4e9fc5..5d0b01f 100644
--- a/InCallUI/res/values-ml-rIN/strings.xml
+++ b/InCallUI/res/values-ml-rIN/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"കോളുകൾ ലയിപ്പിക്കുക"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"സ്വാപ്പുചെയ്യുക"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"കോളുകൾ നിയന്ത്രിക്കുക"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"കോൺഫറൻസ് നിയന്ത്രിക്കുക"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ഓഡിയോ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"വീഡിയോ കോൾ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"വോയ്‌സ്‌ കോളിലേക്ക് മാറ്റുക"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"പൗണ്ട്"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ഡയൽ ചെയ്യുക"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"സ്‌പീക്കർഫോൺ പ്രവർത്തനക്ഷമമാക്കി."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"സ്‌പീക്കർഫോൺ തിരഞ്ഞെടുത്തു"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ഇയർഫോൺ തിരഞ്ഞെടുത്തു"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ് തിരഞ്ഞെടുത്തു"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth ഹെഡ്‌സെറ്റ് തിരഞ്ഞെടുത്തു"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"കോൾ നിശബ്‌ദമാക്കി."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"കോൾ അൺ‌മ്യൂട്ടുചെയ്‌തു."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"കോൾ ഹോൾഡുചെയ്‌തു."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"കോൾ ഹോൾഡുചെയ്‌തത് മാറ്റി."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"മറുപടി നൽകുക"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS അയയ്ക്കുക"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"നിരസിക്കുക"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"വീഡിയോ കോളായി മറുപടി നൽകുക"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ഓഡിയോ കോളായി മറുപടി നൽകുക"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"വീഡിയോ അഭ്യർത്ഥന അംഗീകരിക്കുക"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"വീഡിയോ അഭ്യർത്ഥന നിരസിക്കുക"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി മുകളിലേയ്‌ക്ക് സ്ലൈഡുചെയ്യുക."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി ഇടത്തേയ്‌ക്ക് സ്ലൈഡുചെയ്യുക."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി വലത്തേയ്‌ക്ക് സ്ലൈഡുചെയ്യുക."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"കോൺഫറൻസ് കോൾ നിയന്ത്രിക്കുക"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"അടിയന്തര നമ്പർ"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-mn-rMN/strings.xml b/InCallUI/res/values-mn-rMN/strings.xml
index 950508b..10294e2 100644
--- a/InCallUI/res/values-mn-rMN/strings.xml
+++ b/InCallUI/res/values-mn-rMN/strings.xml
@@ -128,7 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Дуудлагуудыг нэгтгэх"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Солих"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Дуудлагуудыг удирдах"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Утсан хурлыг удирдах"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Утсан хурлыг удирдах"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео хурал"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Дуут дуудлага руу өөрчлөх"</string>
@@ -161,8 +161,14 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"фунт"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"залгах"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ухраах"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Чанга яригчийг идэвхжүүлсэн."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Чанга яригч сонгогдсон"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Чихэвч сонгогдсон"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Утастай чихэвч сонгогдсон"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Блютүүт чихэвч сонгогдсон"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Дууг хаасан."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Дуудлагыг хаасан."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Дуудлагыг хүлээлгэсэн"</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Дуудлагыг хүлээлгээс гаргасан"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Хариулах"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS илгээх"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Татгалзах"</string>
@@ -185,14 +191,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Утсан хурлыг удирдах"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Яаралтай дугаар"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Акаунт сонгох"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index 9a24554..2df4411 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कॉल विलीन करा"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"अदलाबदल करा"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"कॉल व्यवस्थापित करा"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"परिषद व्यवस्थापित करा"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ऑडिओ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"व्हिडिओ कॉल"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"व्हॉइस कॉल वर बदला"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"पाऊंड"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल करा"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्‍पीकरफोन सक्षम केला."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"स्पीकरफोन निवडला"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"इअरपिस निवडला"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"तार असलेला हेडसेट निवडला"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth हेडसेट निवडला"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"कॉल नि.शब्‍द केला."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"कॉल सशब्द केला."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"कॉल होल्डवर ठेवला."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"कॉल होल्डवरुन काढला."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS पाठवा"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"नकार द्या"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"व्हिडिओ कॉल म्हणून उत्तर द्या"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ऑडिओ कॉल म्हणून उत्तर द्या"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"व्हिडिओ विनंती स्वीकारा"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"व्हिडिओ विनंतीस नकार द्या"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी वर स्लाइड करा."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी डावीकडे स्लाइड करा."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी उजवीकडे स्लाइड करा."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"परिषद कॉल व्यवस्थापित करा"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आणीबाणीचा नंबर"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"खाते निवडा"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index f82b4f9..19ed970 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabung panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Silih"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Urus panggilan"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Urus persidangan"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Pgln video"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Tukar ke panggilan suara"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"paun"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dail"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Telefon pembesar suara didayakan."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan diredam."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Jawapan"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Hantar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tolak"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Jawab sebagai panggilan video"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Jawab sebagai panggilan audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Terima permintaan video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tolak permintaan video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Luncurkan ke atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Luncurkan ke kiri untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Luncurkan ke kanan untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Urus panggilan sidang"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nombor kecemasan"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Pilih Akaun"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-my-rMM/strings.xml b/InCallUI/res/values-my-rMM/strings.xml
index f6e978c..b5cfcc9 100644
--- a/InCallUI/res/values-my-rMM/strings.xml
+++ b/InCallUI/res/values-my-rMM/strings.xml
@@ -30,16 +30,16 @@
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"သုံးစွဲသူအမည် သို့မဟုတ် စကားဝှက် မှားနေပါသည်"</string>
     <string name="callFailed_out_of_network" msgid="8740943329772180507">"ကွန်ယက်ပြင်ပမှ ခေါ်ဆိုမှု"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"ဆာဗာမှားယွင်းမှု။ နောင်မှ ပြန်ကြိုးစားပါ"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"ထုတ်လွှင့်မှု မရှိပါ"</string>
+    <string name="callFailed_noSignal" msgid="1889803273616031933">"ထုတ်လွှင့်မှု မရှိပါ"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM အတိုင်းအတာ ကျော်လွန်ပါသည်။"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"ရေဒီယိုအားပိတ်သည်"</string>
     <string name="callFailed_simError" msgid="4476360200030635828">"ဆင်းမ်ကဒ်မရှိ သို့မဟုတ် ဆင်းမ်ကဒ်အမှား"</string>
     <string name="callFailed_outOfService" msgid="682300184520329366">"မိုဘိုင်း ကွန်ရက် မရှိ"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"အထွက် ခေါ်ဆိုမှုများအားFDN မှ ကန့်သတ်ထားပါသည်"</string>
+    <string name="callFailed_fdn_only" msgid="2850204579765430641">"အထွက် ခေါ်ဆိုမှုများအားFDN မှ ကန့်သတ်ထားပါသည်"</string>
     <string name="callFailed_cb_enabled" msgid="3686963693629739680">"ဖုန်းခေါ်ဆိုမှု ပိတ်ထားစဉ် အထွက်ဖုန်းခေါ်ဆိုမှု မပြုနိုင်ပါ"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ဖုန်းခေါ်ဆိုမှုအားလုံးအား ခွင့်ပြုမှု ထိန်းချုပ်ခြင်းစနစ်မှကန့်သတ်ထားပါသည်"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"အရေးပေါ် ခေါ်ဆိုမှုများအား ခွင့်ပြုမှု ထိန်းချုပ်ခြင်းစနစ်မှ ကန့်သတ်ထားပါသည်"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ပုံမှန် ခေါ်ဆိုမှုများအား ခွင့်ပြုမှု ထိန်းချုပ်ခြင်းစနစ်မှ ကန့်သတ်ထားပါသည်"</string>
+    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ဖုန်းခေါ်ဆိုမှုအားလုံးအား ခွင့်ပြုမှု ထိန်းချုပ်ခြင်းစနစ်မှကန့်သတ်ထားပါသည်"</string>
+    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"အရေးပေါ် ခေါ်ဆိုမှုများအား ခွင့်ပြုမှု ထိန်းချုပ်ခြင်းစနစ်မှ ကန့်သတ်ထားပါသည်"</string>
+    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ပုံမှန် ခေါ်ဆိုမှုများအား ခွင့်ပြုမှု ထိန်းချုပ်ခြင်းစနစ်မှ ကန့်သတ်ထားပါသည်"</string>
     <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"နံပါတ်အမှား"</string>
     <string name="confCall" msgid="1904840547188336828">"ကွန်းဖရင့်ခေါ်ဆိုမှု"</string>
     <string name="call_lost" msgid="317670617901479594">"ဖုန်းခေါ်မှု ပျောက်ဆုံးသွားပါသည်"</string>
@@ -69,7 +69,7 @@
     <string name="card_title_video_call" msgid="5898636679563320218">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ဗွီဒီယိုကို တောင်းဆိုနေ"</string>
     <string name="card_title_video_call_error" msgid="5520555528871673801">"ဗွီဒီယို ခေါ်ဆိုမှု ချိတ်ဆက် မရနိုင်"</string>
-    <string name="card_title_callback_number" msgid="4604563437776874016">"သင် ပြန်ခေါ်ရမည့် နံပါတ်\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number" msgid="4604563437776874016">"သင် ပြန်ခေါ်ရမည့် နံပါတ်\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="card_title_callback_number_emergency" msgid="85588345502265075">"သင်၏ အရေးပေါ် ပြန်ခေါ်ရန် နံပါတ်\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ဖုန်းခေါ်နေစဉ်"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
@@ -79,7 +79,7 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ခဏ ကိုင်ထားစဉ်"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"အသံမေးလ်အသစ်"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"အသံစာ အသစ် (<xliff:g id="COUNT">%d</xliff:g>) စောင်"</string>
@@ -117,22 +117,23 @@
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ကီးဘုတ်သုံး၍ခလုတ်နှိပ်ပါ"</string>
     <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ခေါ်ဆိုမှု ခဏရပ်ပါ"</string>
     <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ခေါ်ဆိုမှု ဆက်လုပ်ရန်"</string>
-    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ခေါ်ဆိုမှု ထည့်ရန်"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ခေါ်ဆိုမှု ထည့်ရန်"</string>
     <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ခေါ်ဆိုမှုများကို ပေါင်းစည်းရန်"</string>
     <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ခေါ်ဆိုမှုများကို ဖလှယ်ရန်"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ကိုင်ထားသည်"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ပြီးပါပြီ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"နံပါတ်ကွက်"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"အသံတိတ်"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ဖုန်းခေါ်မှုများကို ပူးပေါင်းသည်"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"လဲပြောင်းသည်"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ဖုန်းခေါ်မှုကို ကြီးကြပ်သည်"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ကွန်းဖရင့် ကို ကြီးကြပ်သည်"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"အသံ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"အသံဖြင့် ခေါ်ဆိုမှုသို့ ပြောင်းရန်"</string>
-    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ကင်မရာကို ဖွင့်ရန်"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"အသံဖြင့် ခေါ်ဆိုမှုသို့ ပြောင်းရန်"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ကင်မရာကို ဖွင့်ရန်"</string>
     <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ဗီဒီယို ဆိုင်းငံ့ရန်"</string>
     <string name="onscreenOverflowText" msgid="2702376562345723132">"နောက်ထပ် ရွေးစရာများ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"ဝန်ဆောင်မှု"</string>
@@ -140,7 +141,7 @@
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"မသတ်မှတ်ထားပါ"</string>
     <string name="other_settings" msgid="3672912580359716394">"တခြားခေါ်ဆိုမှုဆိုင်ရာ ဆက်တင်"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှ ခေါ်ဆိုခြင်း"</string>
-    <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>မှ တစ်ဆင့် ခေါ်ဆိုမှု"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>မှ တစ်ဆင့် ခေါ်ဆိုမှု"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"အဆက်အသွယ်များ၏ ဓာတ်ပုံ"</string>
     <string name="goPrivate" msgid="865837794424530980">"ပရိုက်ဗိတ်သို့ သွားပါ"</string>
     <string name="selectContact" msgid="781975788478987237">"လိပ်စာရွေးပါ"</string>
@@ -161,8 +162,14 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"စတာလင်ပေါင်"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ဖုန်းခေါ်ခြင်း"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"နောက်ပြန်ဖျက်ခလုတ်"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"စပီကာဖုန်း သုံးလို့ရသည်"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"စမီကာဖုန်းကို ရွေးထား"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"နားကြပ်ကို ရွေးထား"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ကြိုးတပ် ဟက်ဆက်ကို ရွေးထား"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ဘလူးတုသ် ဟက်ဆက်ကို ရွေးထား"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"နားထောင်ရုံသာ (စကားပြောပိတ်ထားသည်)"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ခေါ်ဆိုမှု အသံတိတ်မထားပါ"</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ခေါ်ဆိုမှုကို ရပ်ဆိုင်းထားသည်။"</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"ခေါ်ဆိုမှုကို ရပ်ဆိုင်းမှု ထဲမှ ဖယ်ရှားလိုက်ပြီ။"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"အဖြေ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"စာတို ပေးပို့သည်"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"လက်မခံပါ"</string>
@@ -184,15 +191,5 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ဖုန်းမြည်သံ &amp; တုန်ခါသံ"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"ကွန်းဖရင့် ခေါ်ဆိုမှုကို ထိန်းချုပ်သည်"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"အရေးပေါ်နံပါတ်"</string>
-    <string name="select_account_dialog_title" msgid="5730339500156684204">"အကောင့်ကို ရွေးရန်"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"၀"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"၁"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"၂"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"၃"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"၄"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"၅"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"၆"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"၇"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"၈"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"၉"</string>
+    <string name="select_account_dialog_title" msgid="5730339500156684204">"အကောင့်ကို ရွေးရန်"</string>
 </resources>
diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 666fa93..7690065 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Slå sammen samtaler"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Bytt"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrer samtaler"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Administ. konferanse"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Lyd"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videosamtale"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Bytt til taleanrop"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"firkant"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"tilbaketast"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Høyttaler er aktivert."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Høyttaleren er valgt"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Ørepluggen er valgt"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Hodetelefonene med ledning er valgt"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-hodetelefonene er valgt"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Samtalelyd er kuttet."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Anropslyden er slått på."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Anropet er satt på vent."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Anropet er ikke lenger på vent."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send tekstmelding"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Avslå"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Svar med video"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Svar uten video"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Godta videoforespørselen"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Avslå videoforespørselen"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Dra opp for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Dra til venstre for å <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Dra til høyre for å <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer konferansesamtale"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nødnummer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Velg konto"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ne-rNP/strings.xml b/InCallUI/res/values-ne-rNP/strings.xml
index 9428fff..8a65414 100644
--- a/InCallUI/res/values-ne-rNP/strings.xml
+++ b/InCallUI/res/values-ne-rNP/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कलहरू समायोजन  गर्नुहोस्"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"स्वाप"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"कलहरू प्रबन्ध गर्नुहोस्"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"सम्मेलन प्रबन्ध गर्नुहोस्"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"अडियो"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"भिडियो कल"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"आवाज कल गर्न परिवर्तन"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"पाउन्ड"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ब्याकस्पेस"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्पिकरफोन सक्षम भयो।"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"कल म्युट भयो।"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS पठाउनुहोस्"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार गर्नुहोस्"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"भिडियो कल रूपमा जवाफ दिनुहोस्"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"अडियो कलको रूपमा जवाफ दिनुहोस्"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"भिडियो अनुरोध स्वीकार गर्नुहोस्"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"भिडियो अनुरोध अस्वीकार गर्नुहोस्"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> को लागि माथि सार्नुहोस्।"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>को लागि बायाँ सार्नुहोस्।"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>को लागि दायाँ सार्नुहोस्।"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"सम्मेलन कल प्रबन्ध गर्नुहोस्"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आपतकालीन नम्बर"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"खाता चयन गर्नुहोस्"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"०"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"१"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"२"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"३"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"४"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"५"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"६"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"७"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"८"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"९"</string>
 </resources>
diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index c758585..6594eb0 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Oproepen samenvoegen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wisselen"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gesprekken beheren"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Conferentie beheren"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videogesp."</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Wijzigen in spraakoproep"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"hekje"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"bellen"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Telefoonluidspreker is ingeschakeld."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Luidsprekertelefoon geselecteerd"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Oortelefoon geselecteerd"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Bedrade headset geselecteerd"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-headset geselecteerd"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep gedempt."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Dempen van gesprek opgeheven."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Gesprek in de wacht gezet."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Gesprek uit de wacht gehaald."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Sms verzenden"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Weigeren"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Beantwoorden als videogesprek"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Beantwoorden als audiogesprek"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Videoverzoek accepteren"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Videoverzoek weigeren"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Veeg omhoog voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Veeg naar links voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Veeg naar rechts voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonische vergadering beheren"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Alarmnummer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Account selecteren"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index cf52ac0..bde0c5b 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Scal połączenia"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Przełącz"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Zarządzaj połączeniami"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Zarządzaj konferencją"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Dźwięk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Rozmowa wideo"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Zmień na połączenie głosowe"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"znak funta"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"wybierz numer"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"cofnij"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Głośnik włączony."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Połączenie wyciszone."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Odpowiedz"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Wyślij SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odrzuć"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Odbierz jako rozmowę wideo"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Odbierz jako rozmowę audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Przyjmij połączenie wideo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odrzuć połączenie wideo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Przesuń w górę: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Przesuń w lewo: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Przesuń w prawo: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Zarządzaj połączeniem konferencyjnym"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numer alarmowy"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Wybierz konto"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index 10d790f..b8d4dc2 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Intercalar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gerir chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gerir conferência"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Áudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochamada"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mudar para chamada de voz"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"cardinal"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retrocesso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Alta voz ativada."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Alta-voz selecionado"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular selecionado"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auscultadores com microfone integrado com fios selecionados"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auscultadores Bluetooth com microfone integrado selecionados"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem som."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Chamada com som."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chamada colocada em espera."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Chamada removida de espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atender"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videochamada"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como chamada de áudio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceitar o pedido de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Recusar o pedido de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Deslize lentamente para cima para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Deslize lentamente para a esquerda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Deslize lentamente para a direita para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gerir chamada de conferência"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergência"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Selecionar conta"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml
index 5a9fa6d..f9c5896 100644
--- a/InCallUI/res/values-pt/strings.xml
+++ b/InCallUI/res/values-pt/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Mesclar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gerenciar chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gerenciar conferência"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Áudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Vídeo ch."</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Alterar para chamada de voz"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"discar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Viva-voz ativado."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem áudio."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Atender como vídeo chamada"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Atender como chamada de áudio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceitar solicitação de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Recusar solicitação de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para cima."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para a esquerda."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para a direita."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gerenciar conferência telefônica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergência"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Selecionar conta"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index 982a9cb..945476c 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml
@@ -133,7 +133,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Îmbinaţi apelurile"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Schimbaţi"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestionaţi apelurile"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestion. conferinţa"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Apel video"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Treceți la apel vocal"</string>
@@ -166,17 +167,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"diez"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"apelare"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Difuzor activat."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Ați selectat difuzorul"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Ați selectat casca"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Ați selectat setul căști-microfon cu fir"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Ați selectat setul căști-microfon Bluetooth"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Apel cu sunet dezactivat."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"S-a activat sunetul pentru apel."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Apelul a fost pus în așteptare."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Apel a fost scos din așteptare."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Răspundeţi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteţi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Răspundeți ca apel video"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Răspundeți ca apel audio"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acceptați solicitarea de a trece la apel video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Refuzați solicitarea de a trece la apel video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Glisați în sus pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Glisați spre stânga pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Glisați spre dreapta pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -192,14 +197,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestionaţi teleconferinţa"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Număr de urgență"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Selectați un cont"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index 19b70bb..60d0960 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Соединить"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Перевод звонка"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управление вызовами"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Управление конференцией"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Телефонный звонок"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"решетка"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набор номера"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"возврат"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Громкая связь включена."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук выключен."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Ответить"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Отправить SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Отклонить"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Ответить с видео"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Ответить на голосовой вызов"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Ответить на видеовызов"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Отклонить видеовызов"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Проведите вверх, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Проведите влево, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Проведите вправо, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управление конференц-связью"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Экстренная служба"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Выбрать аккаунт"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-si-rLK/strings.xml b/InCallUI/res/values-si-rLK/strings.xml
index 01f8ac4..0e9f527 100644
--- a/InCallUI/res/values-si-rLK/strings.xml
+++ b/InCallUI/res/values-si-rLK/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ඇමතුම් එකට මුසු කරන්න"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"මාරු කරන්න"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ඇමතුම් කළමනාකරණය කරන්න"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"සම්මන්ත්‍රණය කළමනාකරණය කරන්න"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ශ්‍රව්‍ය"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"වීඩියෝ ඇමතුම"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"හඬ ඇමතුමක් වෙත මාරු කරන ලදි"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"පවුම"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"අමතන්න"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ආපසුයවන යතුර"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ස්පිකර්ෆෝන් සබලයි."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ඇමතුම නිශ්ශබ්දයි."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"පිළිතුරු දෙන්න"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS යවන්න"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ප්‍රතික්ෂේප කරන්න"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"වීඩියෝ ඇමතුමට පිළිතුරු දෙන්න"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ශ්‍රව්‍ය ඇමතුමට පිළිතුරු දෙන්න"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"වීඩියෝ ඉල්ලීම පිළිගනියි"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"වීඩියෝ ඉල්ලීම ප්‍රතික්ෂේප කරයි"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා උඩට සර්පණය කරන්න."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා වමට සර්පණය කරන්න."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා දකුණට සර්පණය කරන්න."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"සම්මන්ත්‍රණ ඇමතුම කළමනාකරණය කරන්න"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"හදිසි ඇමතුම් අංකය"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"ගිණුම තෝරන්න"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml
index 385a534..cc750dd 100644
--- a/InCallUI/res/values-sk/strings.xml
+++ b/InCallUI/res/values-sk/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Zlúčiť hovory"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zameniť"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Spravovať hovory"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Správa konferencie"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohovor"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Zmeniť na hlasový hovor"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčanie"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Reproduktor je povolený."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvuk hovoru bol vypnutý."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Odpovedať"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Odoslať SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odmietnuť"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Prijať ako videohovor"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Prijať ako zvukový hovor"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Prijať žiadosť o videohovor"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odmietnuť žiadosť o videohovor"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Prejdite prstom nahor: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Prejdite prstom doľava: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Prejdite prstom doprava: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Spravovať konferenčný hovor"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Číslo tiesňového volania"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Výber účtu"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index b785067..a241319 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Združi klice"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamenjaj"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Upravljanje klicev"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Upravljanje konference"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvok"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videoklic"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Preklopi na glasovni klic"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"funt"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"klicanje"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"vračalka"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Zvočnik omogočen."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Klic izključen."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošlji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Zavrni"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Odgovori z videoklicem"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Odgovori z zvočnim klicem"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Sprejmi zahtevo za video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Zavrni zahtevo za video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Povlecite navzgor za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Povlecite v levo za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Povlecite v desno za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljanje konferenčnih klicev"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Številka za klic v sili"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Izbira računa"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index c701402..220775e 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обједини позиве"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Замени"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управљајте позивима"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Управљај конференцијом"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео поз."</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Промени у гласовни позив"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"фунта"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"бирање"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"тастер за брисање"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Спикерфон је омогућен."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук позива је искључен."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Одговори"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Пошаљи SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Одговорите видео позивом"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Одговорите аудио-позивом"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Прихвати захтев за видео"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Одбиј захтев за видео"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Превуците нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Превуците улево за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Превуците удесно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управљање конференцијским позивом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Број за хитне случајеве"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Изаберите налог"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sv/strings.xml b/InCallUI/res/values-sv/strings.xml
index 959750d..afc276a 100644
--- a/InCallUI/res/values-sv/strings.xml
+++ b/InCallUI/res/values-sv/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Koppla ihop samtal"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Växla"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Hantera samtal"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Hantera konferens"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ljud"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videosamtal"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Byt till röstsamtal"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pund"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring upp"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backsteg"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Högtalartelefon aktiverad."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Högtalartelefon har valts"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Lur har valts"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Mikrofonlurar med sladd har valts"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-mikrofonlurar har valts"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Samtalets ljud avstängt."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Ljudet har slagits på för samtalet."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Samtalet har parkerats."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Samtalet är inte längre parkerat."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Skicka SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Avvisa"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Svara som videosamtal"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Svara som röstsamtal"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acceptera videobegäran"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Neka videobegäran"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Dra uppåt för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Dra åt vänster för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Dra åt höger för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Hantera konferenssamtal"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nödsamtalsnummer"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Välj konto"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index 4123179..e203578 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Changanyisha simu"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Badili"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Dhibiti simu"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Dhibiti kongamano"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Kusikika"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Hangout ya Video"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Badilisha iwe simu ya sauti"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pauni"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"piga simu"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"nafasi ya nyuma"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Spika za simu zimewezeshwa"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Spika ya simu imechaguliwa"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Spika ya sikioni imechaguliwa"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Vifaa vya sauti vinavyotumia waya vimechaguliwa"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Vifaa vya sauti vya Bluetooth vimechaguliwa"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Simu imezimwa."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Sauti ya simu imerejeshwa."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Simu imewekwa isubiri."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Simu iliyokuwa inasubiri imeondolewa."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jibu"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Tuma SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Kataa"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Pokea kama Hangout ya Video"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Pokea kama simu ya sauti"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Kubali ombi la video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Kataa ombi la video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Sogeza juu ili <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Sogeza kushoto ili <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Sogeza kulia ili <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Dhibiti simu ya kongamano"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nambari ya dharura"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Chagua Akaunti"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml
index e0ce209..2950dae 100644
--- a/InCallUI/res/values-ta-rIN/strings.xml
+++ b/InCallUI/res/values-ta-rIN/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"அழைப்புகளை இணை"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"மாற்று"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"அழைப்புகளை நிர்வகி"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"குழு அழைப்பை நிர்வகி"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ஆடியோ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"வீடியோ அழைப்பு"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"குரல் அழைப்பிற்கு மாறு"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"பவுண்ட்"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"டயல்"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ஸ்பீக்கர்ஃபோன் இயக்கப்பட்டது."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"ஸ்பீக்கர்போன் தேர்ந்தெடுக்கப்பட்டது"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"இயர்பீஸ் தேர்ந்தெடுக்கப்பட்டது"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"வயர் ஹெட்செட் தேர்ந்தெடுக்கப்பட்டது"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"புளூடூத் ஹெட்செட் தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"அழைப்பு முடக்கப்பட்டது."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"அழைப்பு இயக்கப்பட்டது."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"அழைப்பு இடைநிறுத்தப்பட்டது."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"அழைப்பு மீள் இயக்கப்பட்டது."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"பதிலளி"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS அனுப்பு"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"நிராகரி"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"வீடியோ அழைப்பில் பதிலளி"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ஆடியோ அழைப்பில் பதிலளி"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"வீடியோ கோரிக்கையை அனுமதி"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"வீடியோ கோரிக்கையை நிராகரி"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> க்கு மேலாக நகர்த்தவும்."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> க்கு இடதுபக்கமாக நகர்த்தவும்."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> வலதுபக்கமாக நகர்த்தவும்."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"குழு அழைப்பை நிர்வகிக்கவும்"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"அவசரகால எண்"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"கணக்கைத் தேர்ந்தெடு"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml
index 8198455..559846e 100644
--- a/InCallUI/res/values-te-rIN/strings.xml
+++ b/InCallUI/res/values-te-rIN/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"కాల్‌లను విలీనం చేయి"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"స్వాప్ చేయి"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"కాల్‌లను నిర్వహించు"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"కాన్ఫరెన్స్‌ను నిర్వహించు"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"ఆడియో"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"వీడియో కాల్"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"వాయిస్ కాల్‌కి మార్చు"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"పౌండ్"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"డయల్ చేయి"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"స్పీకర్ ఫోన్ ప్రారంభించబడింది."</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"స్పీకర్‌ఫోన్ ఎంచుకోబడింది"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ఇయర్‌పీస్ ఎంచుకోబడింది"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"వైర్ గల హెడ్‌సెట్ ఎంచుకోబడింది"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"బ్లూటూత్ హెడ్‌సెట్ ఎంచుకోబడింది"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"కాల్ మ్యూట్ చేయబడింది."</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"కాల్ అన్‌మ్యూట్ చేయబడింది."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"కాల్‌ హోల్డ్‌లో ఉంది."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"కాల్ హోల్డ్ నుండి తీసివేయబడింది."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"సమాధానం ఇవ్వండి"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS పంపండి"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"తిరస్కరిస్తున్నాను"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"వీడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ఆడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"వీడియో అభ్యర్థనను అంగీకరించండి"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"వీడియో అభ్యర్థనను తిరస్కరించండి"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం పైకి స్లైడ్ చేయండి."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం ఎడమవైపుకు స్లైడ్ చేయండి."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం కుడివైపుకు స్లైడ్ చేయండి."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"కాన్ఫరెన్స్ కాల్‌ను నిర్వహించండి"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"అత్యవసర నంబర్"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"ఖాతాను ఎంచుకోండి"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index 4163111..1ea918b 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"รวมสาย"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"สลับ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"จัดการการโทร"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"จัดการการประชุม"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"เสียง"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"แฮงเอาท์วิดีโอ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"เปลี่ยนเป็นการโทรด้วยเสียง"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"ปอนด์"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"หมุนหมายเลข"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ถอยหลัง"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"เปิดใช้งานลำโพงแล้ว"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"ปิดเสียงการโทร"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"คำตอบ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ส่ง SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ปฏิเสธ"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"รับสายเป็นแฮงเอาท์วิดีโอ"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"รับสายเป็นการโทรด้วยเสียง"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ยอมรับคำขอวิดีโอ"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ปฏิเสธคำขอวิดีโอ"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"เลื่อนขึ้นเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"เลื่อนไปทางซ้ายเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"เลื่อนไปทางขวาเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"จัดการการประชุมสาย"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"หมายเลขฉุกเฉิน"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"เลือกบัญชี"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index 1ca8ae0..16b354c 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Pagsamahin ang mga tawag"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Pagpalitin"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Pamahalaan ang mga tawag"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Pamahalaan ang conference"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Gawing voice call"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Mag-dial"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Pinapagana ang speakerphone."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Naka-mute ang tawag."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Sagutin"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Magpadala ng SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tanggihan"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Sagutin bilang video call"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Sagutin bilang audio call"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Tanggapin ang kahilingan sa video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tanggihan ang kahilingan sa video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Mag-slide pataas para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Mag-slide pakaliwa para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Mag-slide pakanan para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Pamahalaan ang conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Pang-emergency na numero"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Pumili ng Account"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 8b9f7d7..c8aecb0 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Çağrıları birleştir"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Değiştir"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Aramaları yönet"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferansı yönet"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ses"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video görüşmesi"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Sesli çağrıya geç"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"kare"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"çevir"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"geri tuşu"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Hoparlör etkin."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Çağrı sesi kapatıldı."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Yanıtla"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS gönder"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Reddet"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Video görüşmesi olarak yanıtla"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Sesli görüşme olarak yanıtla"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Video isteğini kabul et"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Video isteğini reddet"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için yukarı kaydırın."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için sola kaydırın."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için sağa kaydırın."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferans görüşmesini yönet"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Acil durum numarası"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Hesap Seçin"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml
index 1dbde0d..ee10e9e 100644
--- a/InCallUI/res/values-uk/strings.xml
+++ b/InCallUI/res/values-uk/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Об’єдн. дзвінки"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Поміняти"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Керув. викликами"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Керувати конференц."</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Звук"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Відеодзвінок"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Перейти в режим голосового дзвінка"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"решітка"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"дзвонити"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Гучний зв’язок увімкнено."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук виклику вимкнено."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Відповісти"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Надіслати SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Відхилити"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Відповісти в режимі відеодзвінка"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Відповісти в режимі аудіодзвінка"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Прийняти запит на відеодзвінок"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Відхилити запит на відеодзвінок"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – проведіть пальцем угору."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – проведіть пальцем ліворуч."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – проведіть пальцем праворуч."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Керувати конференц-викликом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Екстрений номер"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Вибрати обліковий запис"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index 4d8c097..3bdef12 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"کالیں ضم کریں"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تبادلہ کریں"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"کالوں کا نظم کریں"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"کانفرنس کا نظم کریں"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"آڈیو"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ویڈیو کال"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"صوتی کال میں تبدیل کریں"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"پاؤنڈ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ڈائل کریں"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"بیک اسپیس"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"اسپیکر فون فعال ہوگیا۔"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"کال خاموش کر دی گئی۔"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"جواب دیں"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏SMS بھیجیں"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"مسترد کریں"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"ویڈیو کال کے بطور جواب دیں"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"آڈیو کال کے بطور جواب دیں"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ویڈیو کی درخواست قبول کریں"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ویڈیو کی درخواست مسترد کریں"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے اوپر سلائیڈ کریں۔"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے بائیں سلائیڈ کریں۔"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے دائیں سلائیڈ کریں۔"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"کانفرنس کال کا نظم کریں"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"ہنگامی نمبر"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"اکاؤنٹ منتخب کریں"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml
index cff8747..f9f76f2 100644
--- a/InCallUI/res/values-vi/strings.xml
+++ b/InCallUI/res/values-vi/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hợp nhất cuộc gọi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Hoán đổi"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Quản lý cuộc gọi"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Quản lý hội nghị"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Âm thanh"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"C.gọi video"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Thay đổi thành cuộc gọi thoại"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"dấu thăng"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"quay số"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"phím lùi"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Đã bật loa ngoài."</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Đã tắt tiếng cuộc gọi."</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"Trả lời"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Gửi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Từ chối"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Trả lời là cuộc gọi điện video"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Trả lời là cuộc gọi âm thanh"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Chấp nhận yêu cầu cuộc gọi video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Từ chối yêu cầu cuộc gọi video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Trượt lên để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Trượt sang trái để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Trượt sang phải để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Quản lý cuộc gọi hội nghị"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Số khẩn cấp"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Chọn tài khoản"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index 2e4487b..86b5129 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -88,8 +88,7 @@
     <string name="notification_network_selection_title" msgid="4224455487793492772">"无服务"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"所选网络（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）不可用"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"挂断"</string>
-    <!-- no translation found for notification_action_answer_video (7809271910870211729) -->
-    <skip />
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"视频"</string>
     <string name="notification_action_answer_voice" msgid="1770796916369437773">"语音"</string>
     <string name="notification_action_accept" msgid="2898609801209468429">"接受"</string>
     <string name="notification_action_dismiss" msgid="2679969397930852858">"忽略"</string>
@@ -129,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合并通话"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"交换"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通话"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"管理会议"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"音频"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"视频通话"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"改为语音通话"</string>
@@ -162,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"英镑"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"拨号"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace 键"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"扬声器已启用。"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"通话已静音。"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"接听"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"发送短信"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒绝"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"以视频通话的形式接听"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"以音频通话的形式接听"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"接受视频请求"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"拒绝视频请求"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"向上滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"向左滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"向右滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
@@ -188,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理电话会议"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"紧急电话号码"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"选择帐户"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml
index 6fef02b..57576dc 100644
--- a/InCallUI/res/values-zh-rHK/strings.xml
+++ b/InCallUI/res/values-zh-rHK/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合併通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切換"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通話"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"管理電話會議"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"音頻裝置"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"視像通話"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"變更為語音通話"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"井字鍵"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"退格鍵"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"擴音器已啟用"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"接聽"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"發送短訊"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"接聽視像通話"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"接聽語音通話"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"接受視像通話要求"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"拒絕視像通話要求"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"向上滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"向左滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"向右滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急電話號碼"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"選取帳戶"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index 961f1d4..d8cd907 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合併通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切換"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通話"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"管理會議"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"音訊"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"視訊通話"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"變更為語音通話"</string>
@@ -161,17 +162,28 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"井字鍵"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"喇叭已啟用"</string>
+    <!-- no translation found for accessibility_speakerphone_selected (4389354567657833468) -->
+    <skip />
+    <!-- no translation found for accessibility_earpiece_selected (5749525199671068663) -->
+    <skip />
+    <!-- no translation found for accessibility_wired_headset_selected (2984920743124263932) -->
+    <skip />
+    <!-- no translation found for accessibility_bluetooth_headset_selected (2785473629292181736) -->
+    <skip />
     <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
+    <!-- no translation found for accessibility_call_unmuted (7496527089753980871) -->
+    <skip />
+    <!-- no translation found for accessibility_call_put_on_hold (4226100429657528833) -->
+    <skip />
+    <!-- no translation found for accessibility_call_removed_from_hold (2269352120695851563) -->
+    <skip />
     <string name="description_target_answer" msgid="7205604197797472471">"解答"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"傳送簡訊"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"接聽視訊通話"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"接聽語音通話"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"接受視訊要求"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"拒絕視訊要求"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"向上滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"向左滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"向右滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
@@ -187,14 +199,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急電話號碼"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"選取帳戶"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml
index 36ea661..c1ce83b 100644
--- a/InCallUI/res/values-zu/strings.xml
+++ b/InCallUI/res/values-zu/strings.xml
@@ -128,7 +128,8 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hlanganisa amakholi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Shintsha"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Phatha amakholi"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Phatha umhlangano wezokuxhumana"</string>
+    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
+    <skip />
     <string name="onscreenAudioText" msgid="1710087112800041743">"Umsindo"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Ikholi yevidiyo ye-Hangout"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Shintshela kukholi yezwi"</string>
@@ -161,17 +162,21 @@
     <string name="description_image_button_pound" msgid="1716041284529917866">"iphawundi"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dayela"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"i-backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Isipikha sefoni sinikwe amandla"</string>
+    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Ifoni yesipikha ikhethiwe"</string>
+    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Isipikha sendlebe sikhethiwe"</string>
+    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Ama-earphone anentambo akhethiwe"</string>
+    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Ama-earphone we-Bluetooth akhethiwe"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Ikholu ithulisiwe"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Ikholi isuswe ukuthula."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Ikholi ibanjiwe okwesikhashana."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Ikholi isusiwe ekubanjweni okwesikhashana."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Phendula"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Thumela i-SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Nqaba"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Phendula njengekholi yevidiyo"</string>
     <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Phendula njengekholi yomsindo"</string>
-    <!-- no translation found for description_target_accept_upgrade_to_video_request (2894072808324604062) -->
-    <skip />
-    <!-- no translation found for description_target_decline_upgrade_to_video_request (4093888612888538776) -->
-    <skip />
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Yamukela isicelo sevidiyo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Yenqaba isicelo sevidiyo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slayidela phezulu ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slayida ngakwesokunxele ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slayida ngakwesokudla ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
@@ -187,14 +192,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Phatha ucingo lwengqungquthela"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Inombolo yesimo esiphuthumayo"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"Khetha i-akhawunti"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index bd2642d..3060339 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -62,7 +62,7 @@
     <color name="glowpad_text_widget_ring_color">#ffffff</color>
     <color name="glowpad_widget_active_color">#ffffff</color>
     <color name="glowpad_text_widget_normal_tint">#cccccc</color>
-    <color name="glowpad_call_widget_normal_tint">#00e5ff</color>
+    <color name="glowpad_call_widget_normal_tint">@color/dialtacts_theme_color</color>
     <color name="glowpad_end_call_widget_normal_tint">#ff1744</color>
     <color name="glowpad_incoming_widget_tint">#a3a3a3</color>
     <color name="glowpad_incoming_widget_background_tint">#ffffff</color>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 6bf80f3..8648c8c 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -50,12 +50,6 @@
     <!-- Height and width of the in-call buttons. -->
     <dimen name="in_call_button_dimension">48dp</dimen>
 
-    <!-- Width of buttons in the extra button row. -->
-    <dimen name="extra_row_button_width">56dp</dimen>
-
-    <!-- Height of buttons in the extra button row. -->
-    <dimen name="extra_row_button_height">@dimen/in_call_button_dimension</dimen>
-
     <dimen name="primary_call_elevation">4dp</dimen>
     <dimen name="secondary_call_elevation">4dp</dimen>
 
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 06b7605..0be6e01 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -316,7 +316,7 @@
     <!-- Text for the onscreen "Manage calls" button -->
     <string name="onscreenManageCallsText">Manage calls</string>
     <!-- Text for the onscreen "Manage conference" button [CHAR LIMIT=20] -->
-    <string name="onscreenManageConferenceText">Manage conference</string>
+    <string name="onscreenManageConferenceText">Manage conference call</string>
     <!-- Text for the onscreen "Audio" button that lets you switch
          between speaker / bluetooth / earpiece [CHAR LIMIT=10] -->
     <string name="onscreenAudioText">Audio</string>
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 06aeb87..f49cee9 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -70,27 +70,6 @@
         <item name="android:textOff">@null</item>
     </style>
 
-    <!-- Buttons in extra button row. -->
-    <style name="InCallExtraRowButton">
-        <item name="android:layout_width">@dimen/extra_row_button_width</item>
-        <item name="android:layout_height">@dimen/extra_row_button_height</item>
-        <item name="android:background">@null</item>
-    </style>
-
-    <!-- Text label drawn alongside buttons in the "extra button row" of
-         the in-call onscreen touch UI. -->
-    <style name="InCallExtraRowButtonLabel">
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">@color/incall_call_banner_text_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:layout_marginStart">5dip</item>
-        <item name="android:layout_marginEnd">5dip</item>
-    </style>
-
     <style name="InCallAnimationStyle" parent="@android:style/Animation.Activity">
         <!-- Suppress task-to-task animation happening during the transition from
              OutgoingCallBroadcaster (and SipOptionHandler) to InCallActivity.
diff --git a/InCallUI/src/com/android/incallui/AnswerFragment.java b/InCallUI/src/com/android/incallui/AnswerFragment.java
index 4fb79ac..29747da 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -332,6 +332,11 @@
     }
 
     @Override
+    public Context getContext() {
+        return getActivity();
+    }
+
+    @Override
     public void onAnswer(int videoState, Context context) {
         getPresenter().onAnswer(videoState, context);
     }
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 5b4e39a..4022bb4 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -99,7 +99,7 @@
         getUi().showAnswerUi(true);
 
         boolean withSms = call.can(PhoneCapabilities.RESPOND_VIA_TEXT) && textMsgs != null;
-        if (call.isVideoCall()) {
+        if (call.isVideoCall(getUi().getContext())) {
             if (withSms) {
                 getUi().showTargets(AnswerFragment.TARGET_SET_FOR_VIDEO_WITH_SMS);
                 getUi().configureMessageDialog(textMsgs);
@@ -187,5 +187,6 @@
         public void showTargets(int targetSet);
         public void showMessageDialog();
         public void configureMessageDialog(List<String> textResponses);
+        public Context getContext();
     }
 }
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index 6bd3d0b..9948c21 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -16,6 +16,9 @@
 
 package com.android.incallui;
 
+import com.android.contacts.common.CallUtil;
+
+import android.content.Context;
 import android.net.Uri;
 import android.telecomm.PhoneCapabilities;
 import android.telecomm.GatewayInfo;
@@ -349,8 +352,9 @@
         return mTelecommCall.getDetails().getVideoState();
     }
 
-    public boolean isVideoCall() {
-        return VideoProfile.VideoState.isBidirectional(getVideoState());
+    public boolean isVideoCall(Context context) {
+        return CallUtil.isVideoEnabled(context) &&
+                VideoProfile.VideoState.isBidirectional(getVideoState());
     }
 
     public void setSessionModificationState(int state) {
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index 09a3bc2..14d1363 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -58,9 +58,6 @@
     private PopupMenu mAudioModePopup;
     private boolean mAudioModePopupVisible;
     private PopupMenu mOverflowPopup;
-    private View mExtraRowButton;
-    private View mManageConferenceButton;
-    private View mGenericMergeButton;
 
     private int mPrevAudioMode = 0;
 
@@ -91,13 +88,6 @@
             Bundle savedInstanceState) {
         final View parent = inflater.inflate(R.layout.call_button_fragment, container, false);
 
-        mExtraRowButton = parent.findViewById(R.id.extraButtonRow);
-
-        mManageConferenceButton = parent.findViewById(R.id.manageConferenceButton);
-        mManageConferenceButton.setOnClickListener(this);
-        mGenericMergeButton = parent.findViewById(R.id.cdmaMergeButton);
-        mGenericMergeButton.setOnClickListener(this);
-
         mAudioButton = (ImageButton) parent.findViewById(R.id.audioButton);
         mAudioButton.setOnClickListener(this);
         mChangeToVoiceButton = (ImageButton) parent.findViewById(R.id.changeToVoiceButton);
@@ -166,7 +156,6 @@
                 getPresenter().muteClicked(!button.isSelected());
                 break;
             }
-            case R.id.cdmaMergeButton:
             case R.id.mergeButton:
                 getPresenter().mergeClicked();
                 break;
@@ -195,9 +184,6 @@
             case R.id.overflowButton:
                 mOverflowPopup.show();
                 break;
-            case R.id.manageConferenceButton:
-                getPresenter().manageConferenceButtonClicked();
-                break;
             default:
                 Log.wtf(this, "onClick: unexpected");
                 break;
@@ -664,29 +650,8 @@
     }
 
     @Override
-    public void displayManageConferencePanel(boolean value) {
-        if (getActivity() != null && getActivity() instanceof InCallActivity) {
-            ((InCallActivity) getActivity()).displayManageConferencePanel(value);
-        }
-    }
-
-    @Override
-    public void showManageConferenceCallButton() {
-        mExtraRowButton.setVisibility(View.VISIBLE);
-        mManageConferenceButton.setVisibility(View.VISIBLE);
-        mGenericMergeButton.setVisibility(View.GONE);
-    }
-
-    @Override
-    public void showGenericMergeButton() {
-        mExtraRowButton.setVisibility(View.VISIBLE);
-        mManageConferenceButton.setVisibility(View.GONE);
-        mGenericMergeButton.setVisibility(View.VISIBLE);
-    }
-
-    @Override
-    public void hideExtraRow() {
-       mExtraRowButton.setVisibility(View.GONE);
+    public Context getContext() {
+        return getActivity();
     }
 
     private void maybeSendAccessibilityEvent(View view, int stringId) {
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 93548dd..8a5170c 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -16,6 +16,7 @@
 
 package com.android.incallui;
 
+import android.content.Context;
 import android.telecomm.AudioState;
 import android.telecomm.InCallService.VideoCall;
 import android.telecomm.PhoneCapabilities;
@@ -39,7 +40,6 @@
     private Call mCall;
     private boolean mAutomaticallyMuted = false;
     private boolean mPreviousMuteState = false;
-    private boolean mShowGenericMerge = false;
     private boolean mShowManageConference = false;
     private InCallCameraManager mInCallCameraManager;
 
@@ -165,10 +165,6 @@
         setAudioMode(newMode);
     }
 
-    public void manageConferenceButtonClicked() {
-        getUi().displayManageConferencePanel(true);
-    }
-
     public void muteClicked(boolean checked) {
         Log.d(this, "turning on mute: " + checked);
         TelecommAdapter.getInstance().mute(checked);
@@ -219,7 +215,6 @@
     public void showDialpadClicked(boolean checked) {
         Log.v(this, "Show dialpad " + String.valueOf(checked));
         getUi().displayDialpad(checked /* show */, true /* animate */);
-        updateExtraButtonRow(checked);
     }
 
     public void changeToVideoClicked() {
@@ -297,25 +292,13 @@
             return;
         }
 
-        if (call.isVideoCall()) {
+        if (call.isVideoCall(ui.getContext())) {
             updateVideoCallButtons();
         } else {
             updateVoiceCallButtons(call);
         }
 
         ui.enableMute(call.can(PhoneCapabilities.MUTE));
-
-        // Finally, update the "extra button row": It's displayed above the "End" button, but only
-        // if necessary. It's never displayed while the dialpad is visible since it would overlap.
-        //
-        // The row contains two buttons:
-        //     - "Manage conference" (used only on GSM devices)
-        //     - "Merge" button (used only on CDMA devices)
-        final boolean canMerge = call.can(PhoneCapabilities.MERGE_CALLS);
-        final boolean isGenericConference = call.can(PhoneCapabilities.GENERIC_CONFERENCE);
-        mShowGenericMerge = isGenericConference && canMerge;
-        mShowManageConference = (call.isConferenceCall() && !isGenericConference);
-        updateExtraButtonRow(ui.isDialpadVisible());
     }
 
     private void updateVideoCallButtons() {
@@ -360,20 +343,18 @@
 
         final boolean canMerge = call.can(PhoneCapabilities.MERGE_CALLS);
         final boolean canAdd = call.can(PhoneCapabilities.ADD_CALL);
-        final boolean isGenericConference = call.can(PhoneCapabilities.GENERIC_CONFERENCE);
         final boolean canHold = call.can(PhoneCapabilities.HOLD);
         final boolean canSwap = call.can(PhoneCapabilities.SWAP_CALLS);
         final boolean supportHold = call.can(PhoneCapabilities.SUPPORT_HOLD);
+        final boolean isGenericConference = call.can(PhoneCapabilities.GENERIC_CONFERENCE);
+
         boolean canVideoCall = call.can(PhoneCapabilities.SUPPORTS_VT_LOCAL)
                 && call.can(PhoneCapabilities.SUPPORTS_VT_REMOTE);
-
-        final boolean showMerge = !isGenericConference && canMerge;
-
         ui.showChangeToVideoButton(canVideoCall);
 
-        // Show either MERGE or ADD, but not both.
-        final boolean showMergeOption = showMerge;
-        final boolean showAddCallOption = !showMerge;
+        // Show either MERGE or ADD. Only show both if, for CDMA, we're in a generic conference.
+        final boolean showMergeOption = canMerge;
+        final boolean showAddCallOption = canAdd && (isGenericConference || !canMerge);
         final boolean enableAddCallOption = showAddCallOption && canAdd;
         // Show either HOLD or SWAP, but not both.
         // If neither HOLD or SWAP is available:
@@ -384,8 +365,14 @@
         final boolean showSwapOption = !canHold && canSwap;
 
         ui.setHold(call.getState() == Call.State.ONHOLD);
-        if (canVideoCall && (showAddCallOption || showMergeOption)
-                && (showHoldOption || showSwapOption)) {
+        // If we show video upgrade and add/merge and hold/swap, the overflow menu is needed.
+        final boolean isVideoOverflowScenario = canVideoCall
+                && (showAddCallOption || showMergeOption) && (showHoldOption || showSwapOption);
+        // If we show hold/swap, add, and merge simultaneously, the overflow menu is needed.
+        final boolean isCdmaConferenceOverflowScenario =
+                (showHoldOption || showSwapOption) && showMergeOption && showAddCallOption;
+
+        if (isVideoOverflowScenario) {
             ui.showHoldButton(false);
             ui.showSwapButton(false);
             ui.showAddCallButton(false);
@@ -398,9 +385,20 @@
                     showHoldOption && enableHoldOption /* showHoldMenuOption */,
                     showSwapOption);
         } else {
-            ui.showMergeButton(showMergeOption);
-            ui.showAddCallButton(showAddCallOption);
-            ui.enableAddCall(enableAddCallOption);
+            if (isCdmaConferenceOverflowScenario) {
+                ui.showAddCallButton(false);
+                ui.showMergeButton(false);
+
+                ui.configureOverflowMenu(
+                        showMergeOption,
+                        showAddCallOption && enableAddCallOption /* showAddMenuOption */,
+                        false /* showHoldMenuOption */,
+                        false /* showSwapMenuOption */);
+            } else {
+                ui.showMergeButton(showMergeOption);
+                ui.showAddCallButton(showAddCallOption);
+                ui.enableAddCall(enableAddCallOption);
+            }
 
             ui.showHoldButton(showHoldOption);
             ui.enableHold(enableHoldOption);
@@ -408,25 +406,6 @@
         }
     }
 
-    private void updateExtraButtonRow(boolean isDialpadVisible) {
-        final boolean showExtraButtonRow = (mShowGenericMerge || mShowManageConference) &&
-                !isDialpadVisible;
-
-        Log.d(this, "isGeneric: " + mShowGenericMerge);
-        Log.d(this, "mShowManageConference : " + mShowManageConference);
-        Log.d(this, "mShowGenericMerge: " + mShowGenericMerge);
-        Log.d(this, "isDialpadVisible: " + isDialpadVisible);
-        if (showExtraButtonRow) {
-            if (mShowGenericMerge) {
-                getUi().showGenericMergeButton();
-            } else if (mShowManageConference) {
-                getUi().showManageConferenceCallButton();
-            }
-        } else {
-            getUi().hideExtraRow();
-        }
-    }
-
     public void refreshMuteState() {
         // Restore the previous mute state
         if (mAutomaticallyMuted &&
@@ -465,9 +444,6 @@
         void setSupportedAudio(int mask);
         void configureOverflowMenu(boolean showMergeMenuOption, boolean showAddMenuOption,
                 boolean showHoldMenuOption, boolean showSwapMenuOption);
-        void showManageConferenceCallButton();
-        void showGenericMergeButton();
-        void hideExtraRow();
-        void displayManageConferencePanel(boolean on);
+        Context getContext();
     }
 }
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index bd32684..600689c 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -90,6 +90,8 @@
     private ImageView mSecondaryCallProviderIcon;
     private View mProgressSpinner;
 
+    private View mManageConferenceCallButton;
+
     // Dark number info bar
     private TextView mInCallMessageLabel;
 
@@ -165,10 +167,9 @@
         mPhoneNumber = (TextView) view.findViewById(R.id.phoneNumber);
         mPrimaryName = (TextView) view.findViewById(R.id.name);
         mNumberLabel = (TextView) view.findViewById(R.id.label);
-        mSecondaryCallInfo = (View) view.findViewById(R.id.secondary_call_info);
-        mSecondaryCallProviderInfo = (View) view.findViewById(R.id.secondary_call_provider_info);
+        mSecondaryCallInfo = view.findViewById(R.id.secondary_call_info);
+        mSecondaryCallProviderInfo = view.findViewById(R.id.secondary_call_provider_info);
         mPhoto = (ImageView) view.findViewById(R.id.photo);
-        mCallStateButton = view.findViewById(R.id.callStateButton);
         mCallStateIcon = (ImageView) view.findViewById(R.id.callStateIcon);
         mCallStateVideoCallIcon = (ImageView) view.findViewById(R.id.videoCallIcon);
         mCallStateLabel = (TextView) view.findViewById(R.id.callStateLabel);
@@ -215,15 +216,25 @@
             }
         });
 
-        mPrimaryName.setElegantTextHeight(false);
-        mCallStateLabel.setElegantTextHeight(false);
-
+        mCallStateButton = view.findViewById(R.id.callStateButton);
         mCallStateButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 getPresenter().phoneAccountClicked();
             }
         });
+
+        mManageConferenceCallButton = view.findViewById(R.id.manage_conference_call_button);
+        mManageConferenceCallButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                InCallActivity activity = (InCallActivity) getActivity();
+                activity.showConferenceCallManager();
+            }
+        });
+
+        mPrimaryName.setElegantTextHeight(false);
+        mCallStateLabel.setElegantTextHeight(false);
     }
 
     @Override
@@ -840,6 +851,16 @@
         mPhoto.setVisibility(isVisible ? View.VISIBLE : View.GONE);
     }
 
+    /**
+     * Changes the visibility of the "manage conference call" button.
+     *
+     * @param visible Whether to set the button to be visible or not.
+     */
+    @Override
+    public void showManageConferenceCallButton(boolean visible) {
+        mManageConferenceCallButton.setVisibility(visible ? View.VISIBLE : View.GONE);
+    }
+
     private void dispatchPopulateAccessibilityEvent(AccessibilityEvent event, View view) {
         if (view == null) return;
         final List<CharSequence> eventText = event.getText();
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 2dc4274..b746267 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -245,9 +245,12 @@
         // If the primary call is a video call on hold, still show the contact photo.
         // If the primary call is an active video call, hide the contact photo.
         if (mPrimary != null) {
-            getUi().setPhotoVisible(!(mPrimary.isVideoCall() && callState != Call.State.ONHOLD));
+            getUi().setPhotoVisible(!(mPrimary.isVideoCall(mContext) &&
+                    callState != Call.State.ONHOLD));
         }
 
+        maybeShowManageConferenceCallButton();
+
         final boolean enableEndCallButton = Call.State.isConnectingOrConnected(callState) &&
                 callState != Call.State.INCOMING && mPrimary != null;
         // Hide the end call button instantly if we're receiving an incoming call.
@@ -290,6 +293,16 @@
         }
     }
 
+    /**
+     * Only show the conference call button if we are not in a generic conference.
+     * On CDMA devices, instead of a manage conference call button, we show "add" and "merge"
+     * buttons in the {@link CallButtonFragment}.
+     */
+    private void maybeShowManageConferenceCallButton() {
+        final boolean isGenericConference = mPrimary.can(PhoneCapabilities.GENERIC_CONFERENCE);
+        getUi().showManageConferenceCallButton(mPrimary.isConferenceCall() && !isGenericConference);
+    }
+
     private void setCallbackNumber() {
         String callbackNumber = null;
 
@@ -657,6 +670,7 @@
         void setCallbackNumber(String number, boolean isEmergencyCalls);
         void setPhotoVisible(boolean isVisible);
         void setProgressSpinnerVisible(boolean visible);
+        void showManageConferenceCallButton(boolean visible);
     }
 
     private TelecommManager getTelecommManager() {
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 02635dc..f092033 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -586,10 +586,8 @@
         return mDialpadFragment != null && mDialpadFragment.isVisible();
     }
 
-    public void displayManageConferencePanel(boolean showPanel) {
-        if (showPanel) {
-            mConferenceManagerFragment.setVisible(true);
-        }
+    public void showConferenceCallManager() {
+        mConferenceManagerFragment.setVisible(true);
     }
 
     public void showPostCharWaitDialog(String callId, String chars) {
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 809d294..637ac16 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -328,7 +328,7 @@
             addHangupAction(builder);
         } else if (state == Call.State.INCOMING || state == Call.State.CALL_WAITING) {
             addDismissAction(builder);
-            if (call.isVideoCall()) {
+            if (call.isVideoCall(mContext)) {
                 addVoiceAction(builder);
                 addVideoCallAction(builder);
             } else {
@@ -436,7 +436,7 @@
         // from the foreground call.  And if there's a ringing call,
         // display that regardless of the state of the other calls.
         if (call.getState() == Call.State.ONHOLD) {
-            return R.drawable.stat_sys_phone_call_on_hold;
+            return R.drawable.ic_phone_paused_white_24dp;
         } else if (call.getSessionModificationState()
                 == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
             return R.drawable.ic_videocam;
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index dbbf038..f218de2 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -24,6 +24,7 @@
 import android.telecomm.InCallService.VideoCall;
 import android.view.Surface;
 
+import com.android.contacts.common.CallUtil;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
 import com.android.incallui.InCallPresenter.InCallOrientationListener;
 import com.android.incallui.InCallPresenter.InCallStateListener;
@@ -302,6 +303,11 @@
     @Override
     public void onStateChange(InCallPresenter.InCallState oldState,
             InCallPresenter.InCallState newState, CallList callList) {
+        // Bail if video calling is disabled for the device.
+        if (!CallUtil.isVideoEnabled(mContext)) {
+            return;
+        }
+
         if (newState == InCallPresenter.InCallState.NO_CALLS) {
             exitVideoMode();
         }
@@ -322,7 +328,7 @@
 
             if (primary != null) {
                 checkForVideoCallChange();
-                mIsVideoCall = mPrimaryCall.isVideoCall();
+                mIsVideoCall = mPrimaryCall.isVideoCall(mContext);
                 if (mIsVideoCall) {
                     enterVideoMode();
                 } else {
@@ -366,7 +372,7 @@
      * Checks to see if the current video state has changed and updates the UI if required.
      */
     private void checkForVideoStateChange() {
-        boolean newVideoState = mPrimaryCall.isVideoCall();
+        boolean newVideoState = mPrimaryCall.isVideoCall(mContext);
 
         // Check if video state changed
         if (mIsVideoCall != newVideoState) {