diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d95b2b2..d570a49 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -84,8 +84,8 @@
     <string name="deleteConfirmation" msgid="3727809366015979585">"ይህ እውቂያ ይሰረዝ?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"ሰርዝ"</string>
     <string name="invalidContactMessage" msgid="6204402264821083362">"ዕውቅያው የለም።"</string>
-    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"እውቂያ ወደ መነሻ ማያ ገፅ ታክሏል።"</string>
-    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> ወደ መነሻ ማያ ገፅ ታክሏል።"</string>
+    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"እውቂያ ወደ መነሻ ማያ ገጽ ታክሏል።"</string>
+    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> ወደ መነሻ ማያ ገጽ ታክሏል።"</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"በመሣሪያው ላይ ፎቶዎች የሉም።"</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"የዕውቂያ ፎቶ"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"ብጁ መሰየሚያ ስም"</string>
@@ -120,7 +120,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"እውቅያዎች የሉም"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"<xliff:g id="EMAIL">%s</xliff:g> ወደ እውቅያዎች ዝርዝር ይታከል"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"የዕውቂያዎችዎ ስሞች"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ወደ ቀዳሚው ማያ ገፅ ለመመለስ ጠቅ ያድርጉ"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ወደ ቀዳሚው ማያ ገጽ ለመመለስ ጠቅ ያድርጉ"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"የስልክ ቁጥር ያክሉ"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"ኢሜይል ያክሉ"</string>
     <string name="missing_app" msgid="5674389915738964148">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም።"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 18c1684..3a77900 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -91,8 +91,8 @@
     <string name="customLabelPickerTitle" msgid="816694850254307154">"উপযোগিতা অনুসৰি লেবেলৰ নাম"</string>
     <string name="removePhoto" msgid="1190099414600730001">"ফট\' আঁতৰাওক"</string>
     <string name="noContacts" msgid="3030512741779213810">"আপোনাৰ সম্পৰ্কসূচী খালী আছে"</string>
-    <string name="emptyGroup" msgid="8598261660865081152">"এই লেবেলত কোনো সম্পৰ্ক ব্যক্তি নাই"</string>
-    <string name="emptyAccount" msgid="7450843210977018582">"এই একাউণ্টত কোনো সম্পৰ্ক ব্যক্তি নাই"</string>
+    <string name="emptyGroup" msgid="8598261660865081152">"এই লেবেলত কোনো সম্পৰ্ক ব্য়ক্তি নাই"</string>
+    <string name="emptyAccount" msgid="7450843210977018582">"এই একাউণ্টত কোনো সম্পৰ্ক ব্য়ক্তি নাই"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"আপোনাৰ সম্পৰ্কসূচী খালী আছে"</string>
     <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ছেভ কৰা হ’ল"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"সম্পৰ্ক ছেভ কৰা হ’ল"</string>
@@ -192,7 +192,7 @@
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"অধিক চাওক"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"কম চাওক"</string>
     <string name="about_card_title" msgid="6635849009952435700">"ইয়াৰ বিষয়ে"</string>
-    <string name="toast_making_personal_copy" msgid="9053129410039312386">"ব্যক্তিগত প্ৰতিলিপ সৃষ্টি কৰিথকা হৈছে…"</string>
+    <string name="toast_making_personal_copy" msgid="9053129410039312386">"ব্য়ক্তিগত প্ৰতিলিপ সৃষ্টি কৰিথকা হৈছে…"</string>
     <string name="date_time_set" msgid="8526160894146496334">"ছেট কৰক"</string>
     <string name="header_im_entry" msgid="3581797653862294826">"IM"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"সংস্থা"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index a976a43..dfdefba 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -475,7 +475,7 @@
     <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{Uvezen je # kontakt sa SIM-a}one{Uvezen je # kontakt sa SIM-a}few{Uvezena su # kontakta sa SIM-a}other{Uvezeno je # kontakata sa SIM-a}}"</string>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"Uvoz kontakata sa SIM kartice nije uspeo"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"Uvezite sa SIM-a"</string>
-    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Otkaži"</string>
+    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Otkažite"</string>
     <string name="auto_sync_off" msgid="7039314601316227882">"Automatska sinhronizacija je isključena. Dodirnite da biste je uključili."</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Odbacite"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Sinhronizacija naloga je isključena. Dodirnite da biste je uključili."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3810199..0dc36e0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -331,7 +331,7 @@
     <string name="postal_region" msgid="6130239447563491435">"Πολιτεία"</string>
     <string name="postal_postcode" msgid="33077708757232659">"Ταχυδρομικός κώδικας"</string>
     <string name="postal_country" msgid="6642804283917549861">"Χώρα"</string>
-    <string name="map_home" msgid="2169053372466501148">"Προβολή διεύθυνσης σπιτιού"</string>
+    <string name="map_home" msgid="2169053372466501148">"Προβολή διεύθυνσης οικίας"</string>
     <string name="map_work" msgid="8296916987749726461">"Προβολή διεύθυνσης εργασίας"</string>
     <string name="map_other" msgid="4009931029322619674">"Προβολή διεύθυνσης"</string>
     <string name="map_custom" msgid="7797812861927817335">"Προβολή διεύθυνσης <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 6eefd87..3eebba4 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -45,7 +45,7 @@
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"ಸಂಪರ್ಕಗಳನ್ನು ಸೇರಿಸಿ"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"ಲೇಬಲ್‌ನಿಂದ ತೆಗೆದುಹಾಕಿ"</string>
     <string name="menu_new_group_action_bar" msgid="1670312283925872483">"ಲೇಬಲ್‌ ರಚಿಸಿ"</string>
-    <string name="splitConfirmation" msgid="4750158900636307469">"ಬಹು ಸಂಪರ್ಕಗಳಲ್ಲಿನ ಈ ಸಂಪರ್ಕವನ್ನು ಅನ್‌ಲಿಂಕ್ ಮಾಡಬೇಕೆ?"</string>
+    <string name="splitConfirmation" msgid="4750158900636307469">"ಬಹು ಸಂಪರ್ಕಗಳಲ್ಲಿನ ಈ ಸಂಪರ್ಕವನ್ನು ಅನ್‌ಲಿಂಕ್ ಮಾಡುವುದೇ?"</string>
     <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"ಅನ್‌ಲಿಂಕ್‌"</string>
     <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"ನೀವು ಈಗಾಗಲೇ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು ಮತ್ತು ಬಹು ಸಂಪರ್ಕಗಳಲ್ಲಿನ ಈ ಸಂಪರ್ಕವನ್ನು ಲಿಂಕ್ ರದ್ದುಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
     <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"ಉಳಿಸಿ ಮತ್ತು ಅನ್‌ಲಿಂಕ್‌ ಮಾಡಿ"</string>
@@ -193,7 +193,7 @@
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"ಕಡಿಮೆ ನೋಡಿ"</string>
     <string name="about_card_title" msgid="6635849009952435700">"ಕುರಿತು"</string>
     <string name="toast_making_personal_copy" msgid="9053129410039312386">"ವೈಯಕ್ತಿಕ ಪ್ರತಿಯನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="date_time_set" msgid="8526160894146496334">"ಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="date_time_set" msgid="8526160894146496334">"ಹೊಂದಿಸಿ"</string>
     <string name="header_im_entry" msgid="3581797653862294826">"IM"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"ಸಂಸ್ಥೆ"</string>
     <string name="header_nickname_entry" msgid="1110276804512795150">"ಅಡ್ಡಹೆಸರು"</string>
@@ -387,7 +387,7 @@
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"ಈ ಫಾರ್ಮ್ಯಾಟ್ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮುಗಿದಿದೆ."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"ಸಂಪರ್ಕಗಳ ರಫ್ತು ಮಾಡುವಿಕೆ ಮುಗಿದಿದೆ."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"ಸಂಪರ್ಕಗಳನ್ನು ರಪ್ತು ಮಾಡುವುದನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲಾಗಿದೆ, ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ನೋಟಿಫಿಕೇಶನ್ ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
+    <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"ಸಂಪರ್ಕಗಳನ್ನು ರಪ್ತು ಮಾಡುವುದನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲಾಗಿದೆ, ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಧಿಸೂಚನೆ ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
     <string name="touch_to_share_contacts" msgid="7678194978416052577">"ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ."</string>
     <string name="exporting_contact_list_title" msgid="6599904516394311592">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ರಫ್ತುಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -479,7 +479,7 @@
     <string name="auto_sync_off" msgid="7039314601316227882">"ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್ ಆಫ್‌ ಆಗಿದೆ. ಆನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"ವಜಾಗೊಳಿಸಿ"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"ಖಾತೆಯ ಸಿಂಕ್ ಆಫ್‌ ಆಗಿದೆ. ಆನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"ಸ್ವಯಂ-ಸಿಂಕ್‌ ಆನ್ ಮಾಡಬೇಕೆ?"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"ಸ್ವಯಂ-ಸಿಂಕ್‌ ಆನ್ ಮಾಡುವುದೇ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಖಾತೆಗಳಿಗೆ ನೀವು ಮಾಡುವ ಬದಲಾವಣೆಗಳು Google ಸಂಪರ್ಕಗಳಿಗೆ ಮಾತ್ರವಲ್ಲದೇ, ವೆಬ್ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನಗಳ ನಡುವೆ ನವೀಕೃತವಾಗಿ ಇರಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"ಆನ್ ಮಾಡಿ"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d623661..0b3c5f4 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -79,7 +79,7 @@
     <string name="single_delete_confirmation" msgid="8260949300855537648">"Бул байланыш жок кылынсынбы?"</string>
     <string name="batch_delete_confirmation" msgid="4149615167210863403">"Тандалган байланыштар жок кылынсынбы?"</string>
     <string name="batch_delete_read_only_contact_confirmation" msgid="381691735715182700">"Окуу үчүн гана арналган аккаунтуңуздан байланыштарды жок кылуу мүмкүн эмес, бирок аларды жашырып койсо болот."</string>
-    <string name="batch_delete_multiple_accounts_confirmation" msgid="4547718538924570984">"Өчүрүлө турган байланыштарда бир нече аккаунтунун чоо-жайы бар. Окуу үчүн гана арналган аккаунттарынын чоо-жайы жашырылып, өчпөйт."</string>
+    <string name="batch_delete_multiple_accounts_confirmation" msgid="4547718538924570984">"Жок кылына турган байланыштарда бир нече аккаунтунун чоо-жайы бар. Окуу үчүн гана арналган аккаунттарынын чоо-жайы жашырылып, өчпөйт."</string>
     <string name="multipleContactDeleteConfirmation" msgid="2970218685653877287">"Бул байланыш өчүрүлсө, анын бир нече аккаунтундагы чоо-жайы өчүп калат."</string>
     <string name="deleteConfirmation" msgid="3727809366015979585">"Бул байланыш жок кылынсынбы?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"Жок кылуу"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1124e11..fc6ed71 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -40,7 +40,7 @@
     <string name="menu_editGroup" msgid="8706562583754054622">"Отстрани контакти"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"Преименувај ја етикетата"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"Избриши ја етикетата"</string>
-    <string name="menu_addToGroup" msgid="5034813446697655310">"Додајте контакт"</string>
+    <string name="menu_addToGroup" msgid="5034813446697655310">"Додај контакт"</string>
     <string name="menu_selectForGroup" msgid="6386553337569514850">"Избери контакти"</string>
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"Додај контакти"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"Отстрани од етикетата"</string>
@@ -416,7 +416,7 @@
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Подреди по"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Фонетско име"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Секогаш прикажувај"</string>
-    <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Скриј ако е празно"</string>
+    <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Сокриј ако е празно"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Име"</string>
     <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"Презиме"</string>
     <string name="display_options_view_names_as" msgid="4060686468465916565">"Формат на име"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b8dfd3a..fbdf703 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -472,9 +472,9 @@
     <string name="sim_import_title_none_selected" msgid="3527680774575468781">"အဆက်အသွယ်များကို ရွေးပါ"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"ဆင်းမ်ကဒ်ထဲတွင် လိပ်စာ မရှိပါ"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"အဆက်အသွယ်က သင့်စာရင်းတွင် ရှိနှင့်နေပါပြီ"</string>
-    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{ဆင်းမ်ကတ်ထဲရှိ အဆက်အသွယ် # ခုကို ထည့်သွင်းလိုက်ပါပြီ}other{ဆင်းမ်ကတ်ထဲရှိ အဆက်အသွယ် # ခုကို ထည့်သွင်းလိုက်ပါပြီ}}"</string>
+    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{ဆင်းမ်ထဲရှိ အဆက်အသွယ် # ခုကို ထည့်သွင်းလိုက်ပါပြီ}other{ဆင်းမ်ထဲရှိ အဆက်အသွယ် # ခုကို ထည့်သွင်းလိုက်ပါပြီ}}"</string>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"ဆင်းမ်အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
-    <string name="sim_import_title" msgid="8202961146093040684">"ဆင်းမ်ကတ်မှ တင်သွင်းပါ"</string>
+    <string name="sim_import_title" msgid="8202961146093040684">"ဆင်းမ်ကဒ်မှ တင်သွင်းပါ"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"မလုပ်တော့"</string>
     <string name="auto_sync_off" msgid="7039314601316227882">"အလိုအလျောက်စင့်ခ်လုပ်ခြင်းကို ပိတ်ထားသည်။ ဖွင့်ရန်အတွက် တို့ပါ။"</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"ပယ်ရန်"</string>
@@ -487,7 +487,7 @@
     <string name="show_more_content_description" msgid="6298277298495491712">"ပိုပြပါ"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"ဆင်းမ်ကဒ်ကို တင်သွင်းပြီးပါပြီ"</string>
     <string name="importing_sim_failed_title" msgid="1046154274170241788">"တင်သွင်း၍မရပါ"</string>
-    <string name="importing_sim_failed_message" msgid="55568522164349044">"ဆင်းမ်ကတ်မှ အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
+    <string name="importing_sim_failed_message" msgid="55568522164349044">"ဆင်းမ်ကဒ်မှ အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"ဆင်းမ်ကဒ်ကို တင်သွင်းနေသည်"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"အကြောင်းကြားချက်များ"</string>
     <string name="yes_button" msgid="1120514817091581293">"Yes"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index ecab1d9..58a89f5 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -114,7 +114,7 @@
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"केही सम्पर्कहरूका इमेल ठेगाना छैनन्"</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"केही सम्पर्कहरूका फोन नम्बर छैनन्"</string>
     <string name="menu_sendEmailOption" msgid="8600335923636486825">"इमेल पठाउनुहोस्"</string>
-    <string name="menu_sendMessageOption" msgid="8051852013078110910">"म्यासेज पठाउनुहोस्"</string>
+    <string name="menu_sendMessageOption" msgid="8051852013078110910">"सन्देश पठाउनुहोस्"</string>
     <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"सम्पर्कहरू छान्नुहोस्"</string>
     <string name="send_to_selection" msgid="3655197947726443720">"पठाउनुहोस्"</string>
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"कुनै सम्पर्कहरू छैनन्।"</string>
@@ -272,7 +272,7 @@
     <string name="sms_work_pager" msgid="8827367747655005608">"पाठ कार्य पेजर"</string>
     <string name="sms_assistant" msgid="245045451580096547">"पाठ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="7395133080765833725">"पाठ MMS"</string>
-    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (म्यासेज पठाउनुहोस्)"</string>
+    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (सन्देश पठाउनुहोस्)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"भिडियो कल बनाउनुहोस्"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउने हो?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन एपहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल एपहरूलाई दबाब दिनुहुनेछ।"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 855fdee..9bf3593 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -221,8 +221,8 @@
     <string name="editor_delete_view_description_short" msgid="6471032197042328181">"<xliff:g id="DATA_KIND">%s</xliff:g> ਹਟਾਓ"</string>
     <string name="menu_assistant" msgid="3980364519724237934">"ਸੁਝਾਅ"</string>
     <string name="menu_assistant_new_badge" msgid="1992049406019853898">"ਨਵਾਂ"</string>
-    <string name="navigation_drawer_open" msgid="3428713515765555712">"ਨੈਵੀਗੇਸ਼ਨ ਡ੍ਰਾਅਰ ਖੋਲ੍ਹੋ"</string>
-    <string name="navigation_drawer_close" msgid="3052989100471689722">"ਨੈਵੀਗੇਸ਼ਨ ਡ੍ਰਾਅਰ ਬੰਦ ਕਰੋ"</string>
+    <string name="navigation_drawer_open" msgid="3428713515765555712">"ਆਵਾਗੌਣ ਦਰਾਜ਼ ਖੋਲ੍ਹੋ"</string>
+    <string name="navigation_drawer_close" msgid="3052989100471689722">"ਆਵਾਗੌਣ ਦਰਾਜ਼ ਬੰਦ ਕਰੋ"</string>
     <string name="navigation_drawer_label" msgid="8391863484838783638">"<xliff:g id="LABEL_NAME">%s</xliff:g> ਲੇਬਲ"</string>
     <string name="menu_title_groups" msgid="3722199658759568221">"ਲੇਬਲ"</string>
     <string name="menu_title_filters" msgid="349866121417914494">"ਖਾਤੇ"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f1558ac..c9ff95a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -475,7 +475,7 @@
     <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{Увезен је # контакт са SIM-а}one{Увезен је # контакт са SIM-а}few{Увезена су # контакта са SIM-а}other{Увезено је # контаката са SIM-а}}"</string>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"Увоз контаката са SIM картице није успео"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"Увезите са SIM-а"</string>
-    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Откажи"</string>
+    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Откажите"</string>
     <string name="auto_sync_off" msgid="7039314601316227882">"Аутоматска синхронизација је искључена. Додирните да бисте је укључили."</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Одбаците"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Синхронизација налога је искључена. Додирните да бисте је укључили."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f596105..d07f2c4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -403,9 +403,9 @@
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"<xliff:g id="FILENAME">%s</xliff:g>ని దిగుమతి చేయడం రద్దు చేయబడింది"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> కొద్దిసేపట్లో దిగుమతి చేయబడుతుంది."</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"ఫైల్ కొద్దిసేపట్లో దిగుమతి చేయబడుతుంది."</string>
-    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"vCard దిగుమతి రిక్వెస్ట్‌ తిరస్కరించబడింది. తర్వాత మళ్లీ ట్రై చేయండి."</string>
+    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"vCard దిగుమతి రిక్వెస్ట్‌ తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"కాంటాక్ట్‌లు కొద్ది సేపట్లో ఎగుమతి చేయబడతాయి."</string>
-    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"vCard ఎగుమతి రిక్వెస్ట్‌ తిరస్కరించబడింది. తర్వాత మళ్లీ ట్రై చేయండి."</string>
+    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"vCard ఎగుమతి రిక్వెస్ట్‌ తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"కాంటాక్ట్"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"vCard(ల)ను స్థానిక తాత్కాలిక స్టోరేజ్‌కు కాష్ చేస్తోంది. అసలు దిగుమతి కొద్దిసేపట్లో ప్రారంభమవుతుంది."</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"vCardని దిగుమతి చేయడం సాధ్యపడలేదు."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7c1c724..84a0def 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -332,7 +332,7 @@
     <string name="postal_postcode" msgid="33077708757232659">"Mã ZIP"</string>
     <string name="postal_country" msgid="6642804283917549861">"Quốc gia"</string>
     <string name="map_home" msgid="2169053372466501148">"Xem địa chỉ nhà riêng"</string>
-    <string name="map_work" msgid="8296916987749726461">"Xem địa chỉ nơi làm việc"</string>
+    <string name="map_work" msgid="8296916987749726461">"Xem địa chỉ cơ quan"</string>
     <string name="map_other" msgid="4009931029322619674">"Xem địa chỉ"</string>
     <string name="map_custom" msgid="7797812861927817335">"Xem địa chỉ <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="chat_aim" msgid="2044861410748519265">"Trò chuyện sử dụng AIM"</string>
diff --git a/tests/Android.bp b/tests/Android.bp
index 647fee7..2912673 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -29,7 +29,7 @@
         "androidx.test.ext.junit",
         "hamcrest-library",
         "mockito-target-minus-junit4",
-        "ub-uiautomator",
+        "androidx.test.uiautomator_uiautomator",
     ],
 
     libs: [
diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
index fac9c85..ba9a5b7 100644
--- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
+++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
@@ -8,15 +8,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.Suppress;
 import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
index 250ce4b..9e2f73b 100644
--- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java
+++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
@@ -42,9 +42,6 @@
 import android.provider.ContactsContract.Data;
 import android.provider.SimPhonebookContract;
 import android.provider.SimPhonebookContract.SimRecords;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
 import android.telephony.TelephonyManager;
 import android.test.mock.MockContentResolver;
 
@@ -53,6 +50,9 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.Until;
 
 import com.android.contacts.SimImportService;
 import com.android.contacts.database.SimContactDao;