diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index 99bcbe8..5d798f6 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -57,7 +57,7 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> gemiste oproepe"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Oproep aan die gang"</string>
-    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Voortgaande Wi-Fi-oproep"</string>
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Voortdurende Wi-Fi-oproep"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
     <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Inkomende Wi-Fi-oproep"</string>
diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index 3cf7eb4..aafc574 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> пропуснати обаждания"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуснато обаждане от <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущо обаждане"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Текущо обаждане през Wi-Fi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Задържане на обаждането"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Входящо обаждане"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Входящо обаждане през Wi-Fi"</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>
diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml
index 2480b2e..4d7fa57 100644
--- a/InCallUI/res/values-bn-rBD/strings.xml
+++ b/InCallUI/res/values-bn-rBD/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>টি মিসড কল"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> এর থেকে মিসড কল"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"চালু থাকা কল"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"চলমান Wi-Fi কল"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ইনকামিং কল"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"আগত Wi-Fi কল"</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>
diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index cdef526..443fc96 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> trucades perdudes"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Trucada perduda de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Trucada en procés"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Trucada Wi-Fi en curs"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Trucada entrant"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Trucada Wi-Fi entrant"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videotrucada entrant"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Sol·licitud de vídeo entrant"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Correu de veu nou"</string>
diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index d2c25de..4dfbce8 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>."</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Zmeškaný hovor od volajícího <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>."</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Probíhající hovor"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Probíhající volání přes Wi-Fi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Přidržený hovor"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Příchozí hovor"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Příchozí volání přes Wi-Fi"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Příchozí videohovor"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Příchozí žádost o videohovor"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová zpráva"</string>
diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index d45d55a..7349e5c 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> entgangene Anrufe"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Entgangener Anruf von <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktueller Anruf"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Aktiver WLAN-Anruf"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Gehaltener Anruf"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Eingehender Anruf"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Eingehender WLAN-Anruf"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Eingehender Videoanruf"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Eingehende Videoanfrage"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Neue Nachricht"</string>
diff --git a/InCallUI/res/values-en-rAU/strings.xml b/InCallUI/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..e68ff2f
--- /dev/null
+++ b/InCallUI/res/values-en-rAU/strings.xml
@@ -0,0 +1,153 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Phone"</string>
+    <string name="onHold" msgid="9035493194749959955">"On hold"</string>
+    <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
+    <string name="private_num" msgid="6713286113000232309">"Private number"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
+    <string name="confCall" msgid="1904840547188336828">"Conference call"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Call dropped"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handset earpiece"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired headset"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Send the following tones?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sending tones\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"Send"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"Yes"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Replace wild character with"</string>
+    <string name="caller_manage_header" msgid="3231519674734638786">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Redialling"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"Conference call"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Incoming call"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Call ended"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"On hold"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
+    <string name="card_title_my_phone_number" msgid="112428362494434191">"My number is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Connecting video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video call"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Requesting video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Can\'t connect video call"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Your callback number\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Your emergency callback number\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missed calls"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Ongoing Wi-Fi call"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Incoming Wi-Fi call"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Incoming video call"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Incoming video request"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Answer"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"In-stream video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voice"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accept"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Dismiss"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"To place a call, first turn off Aeroplane mode."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobile network not available."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Can\'t call."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI sequence…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service not supported."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Can\'t conference."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP call"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Turning on radio…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No service. Trying again…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Hold call"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Resume call"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Add call"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Merge calls"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Swap calls"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dial pad"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Mute"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Add call"</string>
+    <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="6801708317570467407">"Manage conference call"</string>
+    <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>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Switch camera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pause video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"More options"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Not set&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Other call settings"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"contact photo"</string>
+    <string name="goPrivate" msgid="865837794424530980">"go private"</string>
+    <string name="selectContact" msgid="781975788478987237">"select contact"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Write your own..."</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel"</string>
+    <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
+    <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>
+    <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>
+    <string name="description_direction_down" msgid="4317245625565166742">"Slide down for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"Phone ringtone"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrate when ringing"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Dialpad auto-complete"</string>
+    <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>
+</resources>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index b390e65..0a5ef90 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> llamadas perdidas"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Llamada Wi-Fi en curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Llamada Wi-Fi entrante"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videollamada entrante"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Solicitud de videollamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuevo mensaje de voz"</string>
diff --git a/InCallUI/res/values-eu-rES/strings.xml b/InCallUI/res/values-eu-rES/strings.xml
index 7da67ce..be58bb6 100644
--- a/InCallUI/res/values-eu-rES/strings.xml
+++ b/InCallUI/res/values-eu-rES/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> dei galdu"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Deitzaile honen dei galdua: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Abian den deia"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Wi-Fi deia abian"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Zain"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Sarrerako deia"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Sarrerako Wi-Fi deia"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Sarrerako bideo-deia"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Sarrerako bideo-eskaera"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ahots-mezu berria"</string>
diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index 10e1249..2114dcd 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> appels manqués"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Appel en cours"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Appel Wi-Fi en cours"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En attente"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Appel entrant"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Appel Wi-Fi entrant"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Appel vidéo entrant"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Demande de vidéo reçue"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nouveau message vocal"</string>
diff --git a/InCallUI/res/values-gl-rES/strings.xml b/InCallUI/res/values-gl-rES/strings.xml
index e823e4c..671e5f1 100644
--- a/InCallUI/res/values-gl-rES/strings.xml
+++ b/InCallUI/res/values-gl-rES/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chamadas perdidas"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada en curso"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Chamada wifi saínte"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Chamada entrante"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Chamada wifi entrante"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videochamada entrante"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Solicitude de vídeo entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correo de voz"</string>
diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 89edef5..d36d2d6 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> छूटी कॉल"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> की कॉल छूटी"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"चल रही कॉल"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"चल रहा वाई-फ़ाई कॉल"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड पर"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"इनकमिंग कॉल"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"इनकमिंग वाई-फ़ाई कॉल"</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>
diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index 50ac3e0..5d82bd5 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Broj propuštenih poziva: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Propušten poziv kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Poziv u tijeku"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Wi-Fi poziv u tijeku"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Dolazni poziv"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Dolazni Wi-Fi poziv"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Dolazni videopoziv"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Dolazni zahtjev za videopoziv"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova govorna pošta"</string>
diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index b736beb..39aa05a 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> nem fogadott hívás"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Nem fogadott hívás: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Hívás folyamatban"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Folyamatban lévő Wi-Fi-hívás"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Tartásban"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Bejövő hívás"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Beérkező Wi-Fi-hívás"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Bejövő videohívás"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Bejövő videokérés"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Új hangposta"</string>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index 971dac2..411539b 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> բաց թողնված զանգ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Բաց թողնված զանգ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ից"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Ընթացիկ զանգը"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Ընթացիկ զանգ Wi-Fi-ի միջոցով"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Սպասում"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Մուտքային զանգ"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Մուտքային զանգ Wi-Fi-ի միջոցով"</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>
diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml
index 710d41b..cff626d 100644
--- a/InCallUI/res/values-ja/strings.xml
+++ b/InCallUI/res/values-ja/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"不在着信<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>件"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>さんからの不在着信"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Wi-Fi通話を発信中"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保留中"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"通話着信"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Wi-Fi通話が着信中"</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>
diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 8bdef6f..988b2d0 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> გამოტოვებული ზარები"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"გამოტოვებული ზარი <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ისგან"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"მიმდინარე ზარი"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"მიმდინარე Wi-Fi ზარი"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"შეყოვნების რეჟიმში"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"შემომავალი ზარი"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"შემომავალი Wi-Fi ზარი"</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>
diff --git a/InCallUI/res/values-kk-rKZ/strings.xml b/InCallUI/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 40e699d..0000000
--- a/InCallUI/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,155 +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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Телефон"</string>
-    <string name="onHold" msgid="9035493194749959955">"Күтуде"</string>
-    <string name="unknown" msgid="6878797917991465859">"Белгісіз"</string>
-    <string name="private_num" msgid="6713286113000232309">"Жеке нөмір"</string>
-    <string name="payphone" msgid="4793877574636445118">"Автомат-телефон"</string>
-    <string name="confCall" msgid="1904840547188336828">"Мәжіліс қоңырауы"</string>
-    <string name="call_lost" msgid="6183862117003999578">"Қоңырау үзілді"</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>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
-    <string name="wait_prompt_str" msgid="7601815427707856238">"Келесі әуендер жіберілсін бе?\n"</string>
-    <string name="pause_prompt_str" msgid="1789964702154314806">"Жіберу әуендері\n"</string>
-    <string name="send_button" msgid="4106860097497818751">"Жіберу"</string>
-    <string name="pause_prompt_yes" msgid="3564467212025151797">"Иә"</string>
-    <string name="pause_prompt_no" msgid="6686238803236884877">"Жоқ"</string>
-    <string name="wild_prompt_str" msgid="5543521676355533577">"Ерекше таңбаны келесі таңбамен алмастыру"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"<xliff:g id="CONF_CALL_TIME">%s</xliff:g> мәжіліс қоңырауы"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Дауыс хабарының нөмірі"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Теруде"</string>
-    <string name="card_title_redialing" msgid="8253487008234167266">"Қайта терілуде"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Мәжіліс қоңырауы"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Келген қоңырау"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Қоңырау аяқталды"</string>
-    <string name="card_title_on_hold" msgid="821463117892339942">"Күтуде"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"Телефон құлағын ілуде"</string>
-    <string name="card_title_in_call" msgid="6346543933068225205">"Қоңырау"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mенің нөмірім <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Бейне қосылуда"</string>
-    <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="9000555878389539225">"Бейне қоңырауға қосылу мүмкін емес"</string>
-    <string name="card_title_callback_number" msgid="7307938207564217293">"Кері қоңырау шалу нөміріңіз\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
-    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Жедел кері қоңырау шалу нөміріңіз\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>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Қабылданбаған қоңыраулар"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> қабылданбаған қоңыраулар"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> қоңырауы қабылданбаған"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Ағымдағы қоңырау"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
-    <string name="notification_on_hold" msgid="3480694969511790465">"Күтуде"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Келген қоңырау"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
-    <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>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> нөмірін теру"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Дауыс хабарының нөмірі белгісіз"</string>
-    <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_answer" msgid="6700362365135365143">"Жауап"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Қоңырауды аяқтау"</string>
-    <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>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кері қоңырау шалу"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Хабар"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Қоңырау шалу үшін алдымен Ұшақ режимін өшіріңіз."</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Желіде тіркелмеген."</string>
-    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Ұялы желі қол жетімді емес."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Қоңырау шалу үшін жарамды нөмірді енгізіңіз."</string>
-    <string name="incall_error_call_failed" msgid="6302746943230078197">"Қоңырау шалу мүмкін емес."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI қатарын бастау…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Қызметке қолдау көрсетілмейді."</string>
-    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Қоңырауларды ауыстыру мүмкін емес."</string>
-    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Қоңырауды бөлу мүмкін емес."</string>
-    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Тасымалдау мүмкін емес."</string>
-    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Конференция мүмкін емес."</string>
-    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Қоңырауды қабылдамау мүмкін емес."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Қоңырау(лар)ды босату мүмкін емес."</string>
-    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP қоңырауы"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Төтенше қоңырау"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радионы қосуда…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Қызмет жоқ. Әрекет қайталануда…"</string>
-    <string name="dial_emergency_error" msgid="1509085166367420355">"Қоңырау шалу мүмкін емес. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> жедел нөмір емес."</string>
-    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Қоңырау шалу мүмкін емес. Жедел нөмірді теріңіз."</string>
-    <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="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="onscreenMergeCallsText" msgid="6640195098064538950">"Қоңырауларды біріктіру"</string>
-    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Алмастыру"</string>
-    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Қоңырауларды басқару"</string>
-    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Конф-қ қоң. басқару"</string>
-    <string name="onscreenAudioText" msgid="1710087112800041743">"Aудио"</string>
-    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео қоңырау"</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>
-    <string name="voicemail_settings" msgid="72448049107749316">"Орнату"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Реттелген жоқt&gt;"</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="contactPhoto" msgid="4713193418046639466">"контакт фотосуреті"</string>
-    <string name="goPrivate" msgid="865837794424530980">"жеке қоңырауға ауысу"</string>
-    <string name="selectContact" msgid="781975788478987237">"контакт таңдау"</string>
-    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Өзіңіздікін жазыңыз..."</string>
-    <string name="custom_message_cancel" msgid="7516406059429609296">"Тоқтату"</string>
-    <string name="custom_message_send" msgid="5795754217085747742">"Жіберу"</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>
-    <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>
-    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үшін төмен сырғыту."</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Тербеліс"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Тербеліс"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Дыбыс"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Бастапқы бойынша дыбыс (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Телефон рингтоны"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Шырылдағанда тербеу"</string>
-    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Теру тақтасын автотолтыру"</string>
-    <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>
-</resources>
diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml
index d98952b..72db016 100644
--- a/InCallUI/res/values-km-rKH/strings.xml
+++ b/InCallUI/res/values-km-rKH/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ខកខាន​ការ​​ទទួល"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"ខកខាន​ទទួល​ពី <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"កំពុង​បន្ត​ការ​ហៅ"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"ការហៅតាម Wi-Fi កំពុងបន្ត"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"រង់ចាំ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ការ​ហៅ​ចូល"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"មានការហៅចូលមកតាម Wi-Fi"</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>
diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml
index 7d8117e..69e55db 100644
--- a/InCallUI/res/values-kn-rIN/strings.xml
+++ b/InCallUI/res/values-kn-rIN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ತಪ್ಪಿದ ಕರೆಗಳು"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ಅವರಿಂದ ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕರೆ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ಒಳಬರುವ ಕರೆ"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</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>
diff --git a/InCallUI/res/values-ko/strings.xml b/InCallUI/res/values-ko/strings.xml
index e02b899..46eb469 100644
--- a/InCallUI/res/values-ko/strings.xml
+++ b/InCallUI/res/values-ko/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"부재중 통화 <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>통"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>의 부재중 전화"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"현재 통화"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Wi-Fi 발신 전화"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"대기 중"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"수신 전화"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Wi-Fi 수신 전화"</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>
diff --git a/InCallUI/res/values-ky-rKG/strings.xml b/InCallUI/res/values-ky-rKG/strings.xml
deleted file mode 100644
index f080e56..0000000
--- a/InCallUI/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,208 +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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for phoneAppLabel (906161039445636857) -->
-    <skip />
-    <!-- no translation found for onHold (9035493194749959955) -->
-    <skip />
-    <!-- no translation found for unknown (6878797917991465859) -->
-    <skip />
-    <!-- no translation found for private_num (6713286113000232309) -->
-    <skip />
-    <string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
-    <!-- no translation found for confCall (1904840547188336828) -->
-    <skip />
-    <string name="call_lost" msgid="6183862117003999578">"Чалуу үзүлдү"</string>
-    <!-- no translation found for audio_mode_speaker (27649582100085266) -->
-    <skip />
-    <!-- no translation found for audio_mode_earpiece (4156527186373869107) -->
-    <skip />
-    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Зымдуу кулакчын"</string>
-    <!-- no translation found for audio_mode_bluetooth (3047641300848211128) -->
-    <skip />
-    <!-- no translation found for wait_prompt_str (7601815427707856238) -->
-    <skip />
-    <string name="pause_prompt_str" msgid="1789964702154314806">"Тоналдык жөнөтүү болууда \n"</string>
-    <!-- no translation found for send_button (4106860097497818751) -->
-    <skip />
-    <!-- no translation found for pause_prompt_yes (3564467212025151797) -->
-    <skip />
-    <!-- no translation found for pause_prompt_no (6686238803236884877) -->
-    <skip />
-    <string name="wild_prompt_str" msgid="5543521676355533577">"Атайын белгини муну менен алмаштыр"</string>
-    <!-- no translation found for caller_manage_header (3231519674734638786) -->
-    <skip />
-    <!-- no translation found for voicemail_settings_number_label (8524164258691887790) -->
-    <skip />
-    <!-- no translation found for card_title_dialing (5769417478498348054) -->
-    <skip />
-    <string name="card_title_redialing" msgid="8253487008234167266">"Кайра терүү"</string>
-    <!-- no translation found for card_title_conf_call (1162980346189744501) -->
-    <skip />
-    <!-- no translation found for card_title_incoming_call (7364539451234646909) -->
-    <skip />
-    <!-- no translation found for card_title_call_ended (5544730338889702298) -->
-    <skip />
-    <!-- no translation found for card_title_on_hold (821463117892339942) -->
-    <skip />
-    <!-- no translation found for card_title_hanging_up (3999101620995182450) -->
-    <skip />
-    <!-- no translation found for card_title_in_call (6346543933068225205) -->
-    <skip />
-    <!-- no translation found for card_title_my_phone_number (112428362494434191) -->
-    <skip />
-    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Видео туташтырылууда"</string>
-    <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="9000555878389539225">"Видео чалууга туташуу мүмкүн болбой жатат"</string>
-    <string name="card_title_callback_number" msgid="7307938207564217293">"Төмөнкү номерге кайра чалуу\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
-    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Төмөнкү номерге шашылыш кайра чалуу\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Терилүүдө"</string>
-    <!-- no translation found for notification_missedCallTitle (7554385905572364535) -->
-    <skip />
-    <!-- no translation found for notification_missedCallsTitle (1361677948941502522) -->
-    <skip />
-    <!-- no translation found for notification_missedCallsMsg (4575787816055205600) -->
-    <skip />
-    <!-- no translation found for notification_missedCallTicker (504686252427747209) -->
-    <skip />
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Учурдагы чалуу"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
-    <!-- no translation found for notification_on_hold (3480694969511790465) -->
-    <skip />
-    <!-- no translation found for notification_incoming_call (2820429205043529642) -->
-    <skip />
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
-    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Келип жаткан видео чалуу"</string>
-    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Келип жаткан видео сурамы"</string>
-    <!-- no translation found for notification_voicemail_title (8933468752045550523) -->
-    <skip />
-    <!-- no translation found for notification_voicemail_title_count (4366360747660929916) -->
-    <skip />
-    <!-- no translation found for notification_voicemail_text_format (4447323569453981685) -->
-    <skip />
-    <!-- no translation found for notification_voicemail_no_vm_number (760963466895609716) -->
-    <skip />
-    <!-- no translation found for notification_network_selection_title (4224455487793492772) -->
-    <skip />
-    <!-- no translation found for notification_network_selection_text (2607085729661923269) -->
-    <skip />
-    <string name="notification_action_answer" msgid="6700362365135365143">"Жооп берүү"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Телефонду коюу"</string>
-    <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>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кайра чалуу"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Билдирүү"</string>
-    <!-- no translation found for incall_error_power_off (6550191216405193368) -->
-    <skip />
-    <!-- no translation found for incall_error_emergency_only (4678640422710818317) -->
-    <skip />
-    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Уюктук тармак жеткиликтүү эмес."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
-    <string name="incall_error_call_failed" msgid="6302746943230078197">"Чалынбай жатат."</string>
-    <!-- no translation found for incall_status_dialed_mmi (3672498861336189563) -->
-    <skip />
-    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Кызмат колдоого алынбайт."</string>
-    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Чалуулар которуштурулбай жатат."</string>
-    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Чалуу бөлүнбөй жатат."</string>
-    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Өткөрүлбөй жатат."</string>
-    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Конференц-байланышы түзүлбөй жатат."</string>
-    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Чалуу четке кагылбай жатат."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Чалуу(лар) бошотулбай жатат."</string>
-    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP чалуу"</string>
-    <!-- no translation found for emergency_enable_radio_dialog_title (4627849966634578257) -->
-    <skip />
-    <!-- no translation found for emergency_enable_radio_dialog_message (207613549344420291) -->
-    <skip />
-    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Кызмат жок. Кайра аракет кылууда…"</string>
-    <string name="dial_emergency_error" msgid="1509085166367420355">"Чалынбай жатат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> өзгөчө кырдаал номери эмес."</string>
-    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Чалынбай жатат. Өзгөчө кырдаал номерин териңиз."</string>
-    <!-- no translation found for dialerKeyboardHintText (9192914825413747792) -->
-    <skip />
-    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Чалууну кармоо"</string>
-    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Чалууну улантуу"</string>
-    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Чалуу кошуу"</string>
-    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Чалууларды бириктирүү"</string>
-    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Чалууларды которуштуруу"</string>
-    <!-- no translation found for onscreenHoldText (2285258239691145872) -->
-    <skip />
-    <!-- no translation found for onscreenEndCallText (4403855834875398585) -->
-    <skip />
-    <!-- no translation found for onscreenShowDialpadText (8561805492659639893) -->
-    <skip />
-    <!-- no translation found for onscreenMuteText (5011369181754261374) -->
-    <skip />
-    <!-- no translation found for onscreenAddCallText (5140385634712287403) -->
-    <skip />
-    <!-- no translation found for onscreenMergeCallsText (6640195098064538950) -->
-    <skip />
-    <!-- no translation found for onscreenSwapCallsText (1602990689244030047) -->
-    <skip />
-    <!-- no translation found for onscreenManageCallsText (5473231160123254154) -->
-    <skip />
-    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Конференц-чалууну башкаруу"</string>
-    <!-- no translation found for onscreenAudioText (1710087112800041743) -->
-    <skip />
-    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео чалуу"</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>
-    <string name="voicemail_settings" msgid="72448049107749316">"Орнотуу"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Орнотулган эмес&gt;"</string>
-    <!-- no translation found for other_settings (3672912580359716394) -->
-    <skip />
-    <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>
-    <!-- no translation found for contactPhoto (4713193418046639466) -->
-    <skip />
-    <!-- no translation found for goPrivate (865837794424530980) -->
-    <skip />
-    <!-- no translation found for selectContact (781975788478987237) -->
-    <skip />
-    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Каалганыңызды жазыңыз..."</string>
-    <string name="custom_message_cancel" msgid="7516406059429609296">"Жокко чыгаруу"</string>
-    <string name="custom_message_send" msgid="5795754217085747742">"Жөнөтүү"</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>
-    <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>
-    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үчүн төмөн сылап коюңуз."</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Титиретүү"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Титиретүү"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Үнү"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Абалкы үнү (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Телефондун рингтону"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Шыңгырап жатканда титиретүү"</string>
-    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Тергичти автотолтуруу"</string>
-    <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>
-</resources>
diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index 014ead3..d62d832 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> praleisti (-ų) skambučiai (-ų)"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"praleistas skambutis nuo <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Vykstantis pokalbis"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Vykstantis „Wi-Fi“ skambutis"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Sulaikyta"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Skambina"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Gaunamasis „Wi-Fi“ skambutis"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Gaunamas vaizdo skambutis"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Gaunama vaizdo skambučio užklausa"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Naujas balso pašto pranešimas"</string>
diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index e220361..f419090 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> neatbildēts(-i) zvans(-i)"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Neatbildēts zvans no: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Pašreizējā saruna"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Notiekošs Wi-Fi zvans"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Aizturēts"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ienākošs zvans"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Ienākošs Wi-Fi zvans"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Ienākošs videozvans"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Ienākošs video pieprasījums"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Jauns balss pasts"</string>
diff --git a/InCallUI/res/values-mk-rMK/strings.xml b/InCallUI/res/values-mk-rMK/strings.xml
deleted file mode 100644
index 236168b..0000000
--- a/InCallUI/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,155 +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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Телефон"</string>
-    <string name="onHold" msgid="9035493194749959955">"На чекање"</string>
-    <string name="unknown" msgid="6878797917991465859">"Непознато"</string>
-    <string name="private_num" msgid="6713286113000232309">"Приватен број"</string>
-    <string name="payphone" msgid="4793877574636445118">"Говорница"</string>
-    <string name="confCall" msgid="1904840547188336828">"Конференциски повик"</string>
-    <string name="call_lost" msgid="6183862117003999578">"Повикот е испуштен"</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>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
-    <string name="wait_prompt_str" msgid="7601815427707856238">"Испрати ги следниве тонови?\n"</string>
-    <string name="pause_prompt_str" msgid="1789964702154314806">"Испраќање тонови\n"</string>
-    <string name="send_button" msgid="4106860097497818751">"Испрати"</string>
-    <string name="pause_prompt_yes" msgid="3564467212025151797">"Да"</string>
-    <string name="pause_prompt_no" msgid="6686238803236884877">"Не"</string>
-    <string name="wild_prompt_str" msgid="5543521676355533577">"Замени резервен знак со"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Конференциски повик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број на говорна пошта"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Бирање"</string>
-    <string name="card_title_redialing" msgid="8253487008234167266">"Повторно бирање"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Конференциски повик"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Дојдовен повик"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Повикот заврши"</string>
-    <string name="card_title_on_hold" msgid="821463117892339942">"На чекање"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"Прекинување повик"</string>
-    <string name="card_title_in_call" msgid="6346543933068225205">"Повик во тек"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Мојот број е <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Се поврзува видео"</string>
-    <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="9000555878389539225">"Не може да поврзе видеоповик"</string>
-    <string name="card_title_callback_number" msgid="7307938207564217293">"Вашиот број за повратен повик\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
-    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Вашиот број за итен повик\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>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени повици"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> пропуштени повици"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуштен повик од <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Тековен повик"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
-    <string name="notification_on_hold" msgid="3480694969511790465">"На чекање"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Дојдовен повик"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
-    <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>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Бирај <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Бројот на говорна пошта е непознат"</string>
-    <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_answer" msgid="6700362365135365143">"Одговори"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Спушти"</string>
-    <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>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Повикува назад"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Порака"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"За да воспоставите повик, прво исклучете режим на работа во авион."</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не е регистриран на мрежа."</string>
-    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Не е достапна мобилна мрежа."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да повикате, внесете важечки број."</string>
-    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не може да повика."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Започнува MMI низа..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Услугата не е поддржана."</string>
-    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не може да префрли повици."</string>
-    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не може да оддели повик."</string>
-    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не може да пренесе."</string>
-    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Не може да влезе во конференција."</string>
-    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Не може да отфрли повик."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Не може да реализира повик(ци)."</string>
-    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Повик преку СИП"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Повик за итни случаи"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Вклучување радио..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нема услуга. Се обидува повторно…"</string>
-    <string name="dial_emergency_error" msgid="1509085166367420355">"Не може да повика. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е број за итни повици."</string>
-    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не може да повика. Бирајте го бројот за итни повици."</string>
-    <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="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="onscreenMergeCallsText" msgid="6640195098064538950">"Спој повици"</string>
-    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Замени"</string>
-    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управувај со повици"</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>
-    <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>
-    <string name="voicemail_settings" msgid="72448049107749316">"Подесување"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не е подесен&gt;"</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="contactPhoto" msgid="4713193418046639466">"фотографија за контакт"</string>
-    <string name="goPrivate" msgid="865837794424530980">"префли на приватно"</string>
-    <string name="selectContact" msgid="781975788478987237">"избери контакт"</string>
-    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напиши сопствена..."</string>
-    <string name="custom_message_cancel" msgid="7516406059429609296">"Откажи"</string>
-    <string name="custom_message_send" msgid="5795754217085747742">"Испрати"</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>
-    <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>
-    <string name="description_direction_down" msgid="4317245625565166742">"Лизгај надолу за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибрирање"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибрирање"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Стандарден звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Мелодија на телефон"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибрирај кога ѕвони"</string>
-    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Авт. доврши подлога за бирање"</string>
-    <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>
-</resources>
diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml
index 69a3f05..26a0a4c 100644
--- a/InCallUI/res/values-ml-rIN/strings.xml
+++ b/InCallUI/res/values-ml-rIN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> മിസ്‌ഡ് കോളുകൾ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> എന്നതിൽ നിന്നുള്ള മിസ്‌ഡ് കോൾ"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"കോൾ സജീവമാണ്"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"ഓൺഗോയിംഗ് Wi-Fi കോൾ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ഹോള്‍ഡിലാണ്"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ഇന്‍കമിംഗ് കോള്‍"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"ഇൻകമിംഗ് Wi-Fi കോൾ"</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>
diff --git a/InCallUI/res/values-mn-rMN/strings.xml b/InCallUI/res/values-mn-rMN/strings.xml
index 4dd03b3..79d0250 100644
--- a/InCallUI/res/values-mn-rMN/strings.xml
+++ b/InCallUI/res/values-mn-rMN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> аваагүй дуудлага"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-н аваагүй дуудлага"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Хийгдэж буй дуудлага"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Ярьж буй Wi-Fi дуудлага"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Хүлээлгэнд"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ирж буй дуудлага"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Орж ирсэн Wi-Fi дуудлага"</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>
diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index 6755075..d3319f2 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> सुटलेले कॉल"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> कडील सुटलेला कॉल"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"सुरू असलेला कॉल"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"सुरु असलेला वाय-फाय कॉल"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड वर"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"येणारा कॉल"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"येणारा वाय-फाय कॉल"</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>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index 2378210..c0ef232 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> panggilan tidak dijawab"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Panggilan tidak dijawab daripada <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan sedang berjalan"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Panggilan Wi-Fi sedang berlangsung"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ditunda"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Panggilan Wi-Fi masuk"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Panggilan video masuk"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Permintaan video masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mel suara baru"</string>
diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 26366bb..26e118f 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> tapte anrop"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtale"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Pågående Wi-Fi-anrop"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Parkert"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Innkommende samtale"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Innkommende anrop via Wi-Fi"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Innkommende videoanrop"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Innkommende videoforespørsel"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nye beskjeder på telefonsvarer"</string>
diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index be5fea4..91c881e 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> gemiste oproepen"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Actieve oproep"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Actieve wifi-oproep"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"In de wacht"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Inkomende wifi-oproep"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Binnenkomend videogesprek"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Binnenkomend videoverzoek"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nieuwe voicemail"</string>
diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index 2929a38..c7e7f87 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> nieodebranych połączeń"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Nieodebrane połączenie z <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Trwa połączenie"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Trwające połączenie przez Wi-Fi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Oczekujące"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Połączenie przychodzące"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Przychodzące połączenie przez Wi-Fi"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Przychodząca rozmowa wideo"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Przychodzące żądanie wideo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nowa poczta głosowa"</string>
diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index 17eaa14..ea7b996 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Пропущенных вызовов: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропущенные вызовы от абонента <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущий вызов"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Текущий Wi-Fi-звонок"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"На удержании"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Входящий вызов"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Входящий Wi-Fi-звонок"</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>
diff --git a/InCallUI/res/values-si-rLK/strings.xml b/InCallUI/res/values-si-rLK/strings.xml
index e3179d5..99ce936 100644
--- a/InCallUI/res/values-si-rLK/strings.xml
+++ b/InCallUI/res/values-si-rLK/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"මඟ හැරුණු ඇමතුම් <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> වෙතින් මඟ හැරුණු ඇමතුම්"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"කරගෙනය යන ඇමතුම"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"දැනට ක්‍රියාත්මක Wi-Fi ඇමතුම"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"රඳවා ගනිමින්"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"එන ඇමතුම"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"පැමිණෙන Wi-Fi ඇමතුම"</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>
diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index 1936b9d..35d999d 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> neodgovorjenih klicev"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Neodgovorjeni klic od <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktivni klic"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Odhodni klic prek Wi-Fi-ja"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Zadržano"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Dohodni klic"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Dohodni klic prek Wi-Fi-ja"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Dohodni videoklic"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Dohodna zahteva za video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova glasovna pošta"</string>
diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index 974f709..0f0fb53 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Број пропуштених позива: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуштен позив од: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Актуелни позив"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Текући Wi-Fi позив"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"На чекању"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Долазни позив"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Долазни Wi-Fi позив"</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>
diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml
index e052035..670e410 100644
--- a/InCallUI/res/values-ta-rIN/strings.xml
+++ b/InCallUI/res/values-ta-rIN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> தவறிய அழைப்புகள்"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> இடமிருந்து தவறிய அழைப்பு"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"செயலில் இருக்கும் அழைப்பு"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"வெளிச்செல்லும் வைஃபை அழைப்பு"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"காத்திருப்பில்"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"உள்வரும் அழைப்பு"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"உள்வரும் வைஃபை அழைப்பு"</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>
diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml
index 4639257..3ae848d 100644
--- a/InCallUI/res/values-te-rIN/strings.xml
+++ b/InCallUI/res/values-te-rIN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> సమాధానం ఇవ్వని కాల్‌లు"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> నుండి సమాధానం ఇవ్వని కాల్"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"కాల్ కొనసాగుతోంది"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Wi-Fi కాల్ కొనసాగుతోంది"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"హోల్డ్‌లో ఉంది"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ఇన్‌కమింగ్ కాల్"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Wi-Fi కాల్ వస్తోంది"</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>
diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index aca4af8..452e607 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> สายที่ไม่ได้รับ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"สายที่ไม่ได้รับจาก <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"โทรต่อเนื่อง"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"กำลังโทรผ่าน Wi-Fi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"พักสาย"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"สายเรียกเข้า"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"สายโทรเข้าผ่าน Wi-Fi"</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>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index 884c129..f6db3ee 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> (na) hindi nasagot na tawag"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Hindi nasagot na tawag mula kay <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Kasalukuyang tawag"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Isinasagawang tawag sa Wi-Fi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Naka-hold"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Papasok na tawag"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Papasok na tawag sa Wi-Fi"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Papasok na video call"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Papasok na kahilingan ng video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Bagong voicemail"</string>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 3b7edad..a8e6f70 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cevapsız çağrı"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Cevapsız çağrı: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Devam eden çağrılar"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Giden kablosuz çağrı"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Beklemede"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Gelen çağrı"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Gelen kablosuz çağrı"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Gelen video görüşmesi isteği"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Gelen video isteği"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Yeni sesli mesaj"</string>
diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index ed45d2f..0244689 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> چھوٹی ہوئی کالیں"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> کی جانب سے چھوٹی ہوئی کال"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"جاری کال"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"‏Wi-Fi کال جاری ہے"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ہولڈ پر"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"آنے والی کال"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"‏Wi-Fi کال آ رہی ہے"</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>
diff --git a/InCallUI/res/values-uz-rUZ/strings.xml b/InCallUI/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index d3ca246..0000000
--- a/InCallUI/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,155 +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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
-    <string name="onHold" msgid="9035493194749959955">"Kutmoqda"</string>
-    <string name="unknown" msgid="6878797917991465859">"Noma’lum"</string>
-    <string name="private_num" msgid="6713286113000232309">"Shaxsiy raqam"</string>
-    <string name="payphone" msgid="4793877574636445118">"Taksofon"</string>
-    <string name="confCall" msgid="1904840547188336828">"Konferensiya qo‘ng‘irog‘i"</string>
-    <string name="call_lost" msgid="6183862117003999578">"Qo‘ng‘iroq tugatildi"</string>
-    <string name="audio_mode_speaker" msgid="27649582100085266">"Karnay"</string>
-    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Telefon quloq eshitgichlari"</string>
-    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Simli garnitura"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
-    <string name="wait_prompt_str" msgid="7601815427707856238">"Ushbu tovushlar jo‘natilsinmi?\n"</string>
-    <string name="pause_prompt_str" msgid="1789964702154314806">"Tovushlar jo‘natilmoqda\n"</string>
-    <string name="send_button" msgid="4106860097497818751">"Jo‘natish"</string>
-    <string name="pause_prompt_yes" msgid="3564467212025151797">"Ha"</string>
-    <string name="pause_prompt_no" msgid="6686238803236884877">"Yo‘q"</string>
-    <string name="wild_prompt_str" msgid="5543521676355533577">"Belgilarni quyidagilar bilan almashtiring:"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Konferensiya qo‘ng‘irog‘i <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Ovozli xabar raqami"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Raqam terilmoqda"</string>
-    <string name="card_title_redialing" msgid="8253487008234167266">"Qayta terilmoqda"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Konferensiya qo‘ng‘irog‘i"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Kiruvchi qo‘ng‘iroq"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Qo‘ng‘iroq tugadi"</string>
-    <string name="card_title_on_hold" msgid="821463117892339942">"Kutish holatida"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"Go‘shak qo‘yilmoqda"</string>
-    <string name="card_title_in_call" msgid="6346543933068225205">"Qo‘ng‘iroqda"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mening raqamim - <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Videoga ulanmoqda"</string>
-    <string name="card_title_video_call" msgid="5898636679563320218">"Video qo‘ng‘iroq"</string>
-    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Video so\'ralmoqda"</string>
-    <string name="card_title_video_call_error" msgid="9000555878389539225">"Video qo‘ng‘iroqqa ulanib bo‘lmadi"</string>
-    <string name="card_title_callback_number" msgid="7307938207564217293">"Teskari qo‘ng‘iroq raqamingiz\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
-    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Favqulodda holatlar uchun teskari qo‘ng‘iroq raqamingiz\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Terilmoqda"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Javob berilmagan qo‘ng‘iroq"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Javobsiz qo‘ng‘iroqlar"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ta javobsiz qo‘ng‘iroq"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>dan javobsiz qo‘ng‘iroq"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Joriy qo‘ng‘iroq"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
-    <string name="notification_on_hold" msgid="3480694969511790465">"Kutmoqda"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Kiruvchi qo‘ng‘iroq"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
-    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Kiruvchi videoqo‘ng‘iroq"</string>
-    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Kiruvchi video so\'rovi"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Yangi ovozli xabar"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yangi ovozli xabar (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>ni terish"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ovozli qo‘ng‘iroq raqami noma’lum"</string>
-    <string name="notification_network_selection_title" msgid="4224455487793492772">"Xizmat mavjud emas"</string>
-    <string name="notification_network_selection_text" msgid="2607085729661923269">"Tanlangan tarmoq (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) mavjud emas"</string>
-    <string name="notification_action_answer" msgid="6700362365135365143">"Javob berish"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Go‘shakni qo‘yish"</string>
-    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Ovoz"</string>
-    <string name="notification_action_accept" msgid="2898609801209468429">"Roziman"</string>
-    <string name="notification_action_dismiss" msgid="2679969397930852858">"Yopish"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Teskari qo‘ng‘iroq"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Xabar"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Qo‘ng‘iroq qilish uchun, avval \"Parvoz rejimi\" o‘chirilishi kerak."</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
-    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobil tarmoq mavjud emas."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
-    <string name="incall_error_call_failed" msgid="6302746943230078197">"Qo‘ng‘iroq qilib bo‘lmadi."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI tartibi ishga tushmoqda..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Xizmat qo‘llab-quvvatlanmaydi."</string>
-    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Qo‘ng‘iroqlarni almashtirib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Qo‘ng‘iroqni ajratib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"O‘tkazib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferens-aloqa o‘rnatib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Qo‘ng‘iroqni rad qilib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Qo‘ng‘iroq(lar)ni chiqarib bo‘lmadi."</string>
-    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP qo‘ng‘iroq"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Favqulodda qo‘ng‘iroq"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio yoqilmoqda…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aloqa yo‘q. Qayta urinilmoqda…"</string>
-    <string name="dial_emergency_error" msgid="1509085166367420355">"Qo‘ng‘iroq qilib bo‘lmadi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> favqulodda raqam emas."</string>
-    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Qo‘ng‘iroq qilib bo‘lmadi. Favqulodda raqamga tering."</string>
-    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Terish uchun tugmatagdan foydalaning"</string>
-    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Qo‘ng‘iroqni ushlab turish"</string>
-    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Qo‘ng‘iroqni davom ettirish"</string>
-    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Qo‘ng‘iroq qo‘shish"</string>
-    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Qo‘ng‘iroqlarni birlashtirish"</string>
-    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Boshqa qo‘ng‘iroq"</string>
-    <string name="onscreenHoldText" msgid="2285258239691145872">"Ushlab turish"</string>
-    <string name="onscreenEndCallText" msgid="4403855834875398585">"Tugatish"</string>
-    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Terish paneli"</string>
-    <string name="onscreenMuteText" msgid="5011369181754261374">"Ovozni o‘chirish"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"Qo‘ng‘iroq qo‘shish"</string>
-    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Qo‘ng‘iroqlarni birlashtirish"</string>
-    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Almashish"</string>
-    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Qo‘ng‘iroqlarni boshqarish"</string>
-    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Konf. aloqani boshqarish"</string>
-    <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
-    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video qo‘ng‘iroq"</string>
-    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Ovozli qo‘ng‘iroqqa o‘zgartirish"</string>
-    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Kamerani almashtirish"</string>
-    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Videoni vaqtincha to‘xtatish"</string>
-    <string name="onscreenOverflowText" msgid="2702376562345723132">"Ko‘proq"</string>
-    <string name="voicemail_provider" msgid="5135942703327136909">"Xizmat"</string>
-    <string name="voicemail_settings" msgid="72448049107749316">"Moslash"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;O‘rnatilmagan&gt;"</string>
-    <string name="other_settings" msgid="3672912580359716394">"Boshqa qo‘ng‘iroq sozlamalari"</string>
-    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
-    <string name="incoming_via_template" msgid="1696993226115570960">"Kiruvchi qo‘ng‘iroqlar <xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali"</string>
-    <string name="contactPhoto" msgid="4713193418046639466">"kontakt surati"</string>
-    <string name="goPrivate" msgid="865837794424530980">"alohidaga o‘tish"</string>
-    <string name="selectContact" msgid="781975788478987237">"kontaktni tanlash"</string>
-    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"O‘z javobingizni yozing..."</string>
-    <string name="custom_message_cancel" msgid="7516406059429609296">"Bekor qilish"</string>
-    <string name="custom_message_send" msgid="5795754217085747742">"Jo‘natish"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Javob berish"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS yuborish"</string>
-    <string name="description_target_decline" msgid="4789834364389731957">"Rad qilish"</string>
-    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Video qo\'ng\'iroq sifatida javob berish"</string>
-    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Audio qo\'ng\'iroq sifatida javob berish"</string>
-    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Video qo‘ng‘iroq so‘rovini qabul qilish"</string>
-    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Video qo‘ng‘iroq so‘rovini rad qilish"</string>
-    <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun tepaga suring."</string>
-    <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun chapga suring."</string>
-    <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun o‘ngga suring."</string>
-    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun pastga suring."</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Tebranish"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Tebratish"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ovoz"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Standart ovoz (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Telefon qo‘ng‘iroq ohangi"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Jiringlash vaqtida tebranish"</string>
-    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Tugmachalarni avto-to‘ldirish"</string>
-    <string name="preference_category_ringtone" msgid="5197960752529332721">"Qo‘ng‘iroq ohangi &amp; tebranish"</string>
-    <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferensiya qo‘ng‘irog‘ini boshqarish"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Favqulodda qo‘ng‘iroq raqamlari"</string>
-</resources>
diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml
index 0e571d4..0aed27d 100644
--- a/InCallUI/res/values-vi/strings.xml
+++ b/InCallUI/res/values-vi/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cuộc gọi nhỡ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Cuộc gọi nhỡ từ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Cuộc gọi đang thực hiện"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Cuộc gọi đang diễn ra qua Wi-Fi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Đang chờ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Cuộc gọi đến"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Cuộc gọi đến qua Wi-Fi"</string>
     <string name="notification_incoming_video_call" msgid="7356836933934464805">"Cuộc gọi điện video đến"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"Yêu cầu video đến"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Thư thoại mới"</string>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index b825475..28a8387 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 个未接电话"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"来自<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>的未接电话"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"当前通话"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"正在进行 WLAN 通话"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保持"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"来电"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"WLAN 来电"</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>
diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml
index cb2c6c1..19909cb 100644
--- a/InCallUI/res/values-zh-rHK/strings.xml
+++ b/InCallUI/res/values-zh-rHK/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 未接電話"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>打來的未接來電"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"正在進行 Wi-Fi 通話"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保留通話"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Wi-Fi 來電"</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>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index 9fcb2b7..294b08d 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -57,12 +57,10 @@
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 通未接來電"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
-    <!-- no translation found for notification_ongoing_call_wifi (8521553590606569379) -->
-    <skip />
+    <string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"撥出的 Wi-Fi 電話"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"通話保留"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
-    <!-- no translation found for notification_incoming_call_wifi (9210706506594546627) -->
-    <skip />
+    <string name="notification_incoming_call_wifi" msgid="9210706506594546627">"撥入的 Wi-Fi 電話"</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>