diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index 2178ab7..e6f06f3 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -119,8 +119,8 @@
 
             <ImageButton android:id="@+id/handoffButton"
                 android:enabled="false"
-            android:layout_width="@dimen/floating_action_button_width"
-            android:layout_height="@dimen/floating_action_button_height"
+                android:layout_width="@dimen/floating_action_button_width"
+                android:layout_height="@dimen/floating_action_button_height"
                 android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
                 android:background="@drawable/floating_handoff_button_compound_background"
                 android:src="@drawable/ic_in_call_pstn" />
diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index d15d34d..73290be 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Luitoon en vibreer"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Bestuur konferensie-oproep"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Noodnommer"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Verbind via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Oordrag"</string>
 </resources>
diff --git a/InCallUI/res/values-am/strings.xml b/InCallUI/res/values-am/strings.xml
index 305eabf..fe7a7a0 100644
--- a/InCallUI/res/values-am/strings.xml
+++ b/InCallUI/res/values-am/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"የደወል ቅላጼ እና ንዘረት"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"የስብሰባስልክ ጥሪ አደራጅ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"የአደጋ ጊዜ ቁጥር"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"በ<xliff:g id="WIFI_SSID">%s</xliff:g> በኩል ተገናኝተዋል"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"አቀብል"</string>
 </resources>
diff --git a/InCallUI/res/values-ar/strings.xml b/InCallUI/res/values-ar/strings.xml
index 3d397bc..ac245a8 100644
--- a/InCallUI/res/values-ar/strings.xml
+++ b/InCallUI/res/values-ar/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"نغمة الرنين والاهتزاز"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"إدارة مكالمة جماعية"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"رقم الطوارئ"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"تم الاتصال عبر <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"تحويل"</string>
 </resources>
diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index 158f589..4363fe3 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодия и вибриране"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управление на конферентно обаждане"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Спешен номер"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Установена е връзка през „<xliff:g id="WIFI_SSID">%s</xliff:g>“"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Прехвърляне"</string>
 </resources>
diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index 141309b..a4d2d98 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"So i vibració"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Connectat mitjançant <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transfereix"</string>
 </resources>
diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index 32bf3de..33d88f9 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Vyzvánění a vibrace"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Připojeno přes <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Nahrát"</string>
 </resources>
diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml
index df6cfeb..273a47b 100644
--- a/InCallUI/res/values-da/strings.xml
+++ b/InCallUI/res/values-da/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibration"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer telefonmøde"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nødnummer"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Forbundet via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Videregivelse"</string>
 </resources>
diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index 9915e25..32e9814 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Klingelton &amp; Vibration"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonkonferenz verwalten"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Notrufnummer"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Verbunden über <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Übergabe"</string>
 </resources>
diff --git a/InCallUI/res/values-el/strings.xml b/InCallUI/res/values-el/strings.xml
index 15335ca..39e8536 100644
--- a/InCallUI/res/values-el/strings.xml
+++ b/InCallUI/res/values-el/strings.xml
@@ -157,8 +157,7 @@
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Συνδέθηκε μέσω <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-en-rGB/strings.xml b/InCallUI/res/values-en-rGB/strings.xml
index f32be1a..70e5ae6 100644
--- a/InCallUI/res/values-en-rGB/strings.xml
+++ b/InCallUI/res/values-en-rGB/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Emergency number"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Connected via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-en-rIN/strings.xml b/InCallUI/res/values-en-rIN/strings.xml
index f32be1a..70e5ae6 100644
--- a/InCallUI/res/values-en-rIN/strings.xml
+++ b/InCallUI/res/values-en-rIN/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Emergency number"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Connected via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml
index 9464afd..f27925b 100644
--- a/InCallUI/res/values-es-rUS/strings.xml
+++ b/InCallUI/res/values-es-rUS/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Conexión a través de <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transferir"</string>
 </resources>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index 3bd9aca..9583364 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Conectado a través de <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <string name="dialpad_7_number" msgid="277455349526398354">"s"</string>
     <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
     <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transferir"</string>
 </resources>
diff --git a/InCallUI/res/values-et-rEE/strings.xml b/InCallUI/res/values-et-rEE/strings.xml
index b4d6b21..e41347b 100644
--- a/InCallUI/res/values-et-rEE/strings.xml
+++ b/InCallUI/res/values-et-rEE/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Helin ja vibratsioon"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konverentskõne haldamine"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Hädaabinumber"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Ühendatud võrgu <xliff:g id="WIFI_SSID">%s</xliff:g> kaudu"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Üleandmine"</string>
 </resources>
diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml
index a8603c0..fa5d9a0 100644
--- a/InCallUI/res/values-fa/strings.xml
+++ b/InCallUI/res/values-fa/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"آهنگ‌ زنگ و لرزش"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"مدیریت تماس کنفرانس"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"شماره اضطراری"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"متصل شده از طریق <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <string name="dialpad_7_number" msgid="277455349526398354">"۷"</string>
     <string name="dialpad_8_number" msgid="4764964930466503513">"۸"</string>
     <string name="dialpad_9_number" msgid="4023642800448238950">"۹"</string>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"هند آف"</string>
 </resources>
diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml
index 1cb15dc..9db584c 100644
--- a/InCallUI/res/values-fi/strings.xml
+++ b/InCallUI/res/values-fi/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Soittoääni ja värinä"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Hallinnoi puhelinneuvottelua"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Hätänumero"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Yhteys – <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Siirtäminen"</string>
 </resources>
diff --git a/InCallUI/res/values-fr-rCA/strings.xml b/InCallUI/res/values-fr-rCA/strings.xml
index 8410257..df0466f 100644
--- a/InCallUI/res/values-fr-rCA/strings.xml
+++ b/InCallUI/res/values-fr-rCA/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Connecté sur le réseau <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transfert"</string>
 </resources>
diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index 3277efd..7444186 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Connecté via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transférer"</string>
 </resources>
diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 831050c..8811abb 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिंगटोन और कंपन"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आपातकालीन नंबर"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"<xliff:g id="WIFI_SSID">%s</xliff:g> के द्वारा कनेक्ट किया गया"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"हैंडऑफ़"</string>
 </resources>
diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index 535039c..81d7529 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Melodija zvona i vibracija"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljanje konferencijskim pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Broj hitne službe"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Povezan putem mreže <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Prijeđi na drugu frekvenciju"</string>
 </resources>
diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index 807011f..292f6be 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Csengőhang és rezgés"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Csatlakozás a következőn keresztül: <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Hívásátadás"</string>
 </resources>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index d579366..96c1c7e 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -157,8 +157,7 @@
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Կապված է <xliff:g id="WIFI_SSID">%s</xliff:g>-ի միջոցով"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Փոխանցում"</string>
 </resources>
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index e6ed315..3cdfead 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Getar"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Kelola penggilan telewicara"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nomor darurat"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Tersambung melalui <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-it/strings.xml b/InCallUI/res/values-it/strings.xml
index 729ae3b..6e6ad62 100644
--- a/InCallUI/res/values-it/strings.xml
+++ b/InCallUI/res/values-it/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Suoneria e vibrazione"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestisci audioconferenza"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numero di emergenza"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Connesso tramite <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-iw/strings.xml b/InCallUI/res/values-iw/strings.xml
index 62c330f..9b44baf 100644
--- a/InCallUI/res/values-iw/strings.xml
+++ b/InCallUI/res/values-iw/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"רינגטון ורטט"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"נהל שיחת ועידה"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"מספר חירום"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"מחובר באמצעות <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"מסירה"</string>
 </resources>
diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml
index 35fc900..7c493d0 100644
--- a/InCallUI/res/values-ja/strings.xml
+++ b/InCallUI/res/values-ja/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"着信音とバイブレーション"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"グループ通話オプション"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急通報番号"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"<xliff:g id="WIFI_SSID">%s</xliff:g>経由で接続済み"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"ハンドオフ"</string>
 </resources>
diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 75987ac..243bfd5 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml
@@ -157,8 +157,7 @@
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"დაკავშირებულია <xliff:g id="WIFI_SSID">%s</xliff:g>-თი"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"გადაცემა"</string>
 </resources>
diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml
index fa4ea1e..c410fad 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>
@@ -157,8 +157,7 @@
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"ភ្ជាប់​តាម <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"បញ្ជូន"</string>
 </resources>
diff --git a/InCallUI/res/values-ko/strings.xml b/InCallUI/res/values-ko/strings.xml
index aa42239..a8bed68 100644
--- a/InCallUI/res/values-ko/strings.xml
+++ b/InCallUI/res/values-ko/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"벨소리 및 진동"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"다자간 통화 관리"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"비상 전화번호"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"<xliff:g id="WIFI_SSID">%s</xliff:g>을(를) 통해 연결됨"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"핸드오프"</string>
 </resources>
diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index c114835..fbcb0f5 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Skambėjimo tonas ir vibracija"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Valdyti konferencinį skambutį"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Pagalbos numeris"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Prisijungta naudojant „<xliff:g id="WIFI_SSID">%s</xliff:g>“"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Perduoti"</string>
 </resources>
diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index 168eeb3..e74799c 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvana signāls un vibrācija"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Savienojums ar <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Nodošana"</string>
 </resources>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index b18801f..111847d 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Bergetar"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Urus panggilan sidang"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nombor kecemasan"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Disambungkan melalui <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Sangga"</string>
 </resources>
diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 03bd1c1..c9e9b6b 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibrering"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer konferansesamtale"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nødnummer"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Koblet til via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Håndfri"</string>
 </resources>
diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index 2db8337..e7bde64 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Beltoon en trillen"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonische vergadering beheren"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Alarmnummer"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Verbonden via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index 6597b04..14173fe 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Dzwonek i wibracje"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Zarządzaj połączeniem konferencyjnym"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numer alarmowy"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Połączenie przez <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Przełącz"</string>
 </resources>
diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index 4515c05..3e400b8 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tocar e Vibrar"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Ligado via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transferir"</string>
 </resources>
diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml
index cb1ad02..9cc25ca 100644
--- a/InCallUI/res/values-pt/strings.xml
+++ b/InCallUI/res/values-pt/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Conectado via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Entregar"</string>
 </resources>
diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index 2f9ab14..c4f0ca3 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de sonerie și vibrare"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"S-a realizat conexiunea prin <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Transfer"</string>
 </resources>
diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index 07b0a27..b5f4f3a 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон и вибросигнал"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управление конференц-связью"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Экстренная служба"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Подключение через <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Переключить сигнал"</string>
 </resources>
diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml
index bd064e4..1c1c46d 100644
--- a/InCallUI/res/values-sk/strings.xml
+++ b/InCallUI/res/values-sk/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tón zvonenia a vibrovanie"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Pripojené prostredníctvom siete <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Odovzdať"</string>
 </resources>
diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index 4e665fc..65aec02 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvonjenje in vibriranje"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Klic vzpostavljen prek omrežja <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Prenos"</string>
 </resources>
diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index 3cd9740..1a10749 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија звона и вибрација"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управљање конференцијским позивом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Број за хитне случајеве"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Повезано је преко <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Предавање управљања"</string>
 </resources>
diff --git a/InCallUI/res/values-sv/strings.xml b/InCallUI/res/values-sv/strings.xml
index fd1d12a..d4eb06c 100644
--- a/InCallUI/res/values-sv/strings.xml
+++ b/InCallUI/res/values-sv/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringsignal och vibrera"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Hantera konferenssamtal"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nödsamtalsnummer"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Ansluten via <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Överlämning"</string>
 </resources>
diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index bec2a8d..3003062 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Mlio wa simu na Mtetemo"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Dhibiti simu ya kongamano"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nambari ya dharura"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Imeunganishwa kupitia <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Unganisha"</string>
 </resources>
diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index dc6bfa5..ddc5976 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"เสียงเรียกเข้าและสั่น"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"จัดการการประชุมสาย"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"หมายเลขฉุกเฉิน"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"เชื่อมต่อแล้วผ่าน <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"โอนช่องสัญญาณ"</string>
 </resources>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index df68460..8788e51 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone at Pag-vibrate"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Nakakonekta sa pamamagitan ng <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"I-handoff"</string>
 </resources>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 3d77fe7..29ab66c 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zil Sesi ve Titreşim"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"<xliff:g id="WIFI_SSID">%s</xliff:g> ile bağlandı"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Aktar"</string>
 </resources>
diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml
index 6c9fc08..7b6d21d 100644
--- a/InCallUI/res/values-uk/strings.xml
+++ b/InCallUI/res/values-uk/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Сигнал дзвінка та вібросигнал"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Керувати конференц-викликом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Екстрений номер"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Під’єднано через <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Переадресовувати виклики"</string>
 </resources>
diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml
index 241622a..6b214a4 100644
--- a/InCallUI/res/values-vi/strings.xml
+++ b/InCallUI/res/values-vi/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nhạc chuông và rung"</string>
     <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>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Đã kết nối qua <xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Chuyển vùng"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index 2990d5b..a3c9ee1 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"铃声和振动"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理电话会议"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"紧急电话号码"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"已通过“<xliff:g id="WIFI_SSID">%s</xliff:g>”连接到网络"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"切换"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml
index 3a8a282..a2d5f34 100644
--- a/InCallUI/res/values-zh-rHK/strings.xml
+++ b/InCallUI/res/values-zh-rHK/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急電話號碼"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"透過 <xliff:g id="WIFI_SSID">%s</xliff:g> 連線"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"轉接"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index d2d3ebf..289853a 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急電話號碼"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"透過 <xliff:g id="WIFI_SSID">%s</xliff:g> 連線"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"轉接"</string>
 </resources>
diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml
index ec7a25b..fa112e9 100644
--- a/InCallUI/res/values-zu/strings.xml
+++ b/InCallUI/res/values-zu/strings.xml
@@ -157,8 +157,7 @@
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ithoni yokukhala nokudlidliza"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Phatha ucingo lwengqungquthela"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Inombolo yesimo esiphuthumayo"</string>
-    <!-- no translation found for in_call_wifi_connected (8179928320848155569) -->
-    <skip />
+    <string name="in_call_wifi_connected" msgid="8179928320848155569">"Ixhumeke nge-<xliff:g id="WIFI_SSID">%s</xliff:g>"</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>
@@ -169,6 +168,5 @@
     <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>
-    <!-- no translation found for connection_handoff_text (394933522990446004) -->
-    <skip />
+    <string name="connection_handoff_text" msgid="394933522990446004">"Ukunikezwa"</string>
 </resources>
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 9422425..df791bb 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -302,7 +302,8 @@
         }
 
         mHandoffButton.setEnabled(isHandoffCapable && !isHandoffPending);
-        mHandoffButton.setVisibility(mHandoffButton.isEnabled() ? View.VISIBLE : View.GONE);
+        mHandoffButton.setVisibility(isWiFi || mHandoffButton.isEnabled() ?
+                View.VISIBLE : View.GONE);
         mHandoffButton.setImageResource(isWiFi ?
                 R.drawable.ic_in_call_wifi : R.drawable.ic_in_call_pstn);
     }