diff --git a/res/drawable-hdpi/googlelogo_dark20_color_132x44.png b/res/drawable-hdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 078c8a8..0000000
--- a/res/drawable-hdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/googlelogo_dark20_color_184x60.png b/res/drawable-hdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 9d25e3d..0000000
--- a/res/drawable-hdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/product_logo_contacts_color_144.png b/res/drawable-hdpi/product_logo_contacts_color_144.png
index d26a363..293a85e 100644
--- a/res/drawable-hdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-hdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-hdpi/product_logo_contacts_color_192.png b/res/drawable-hdpi/product_logo_contacts_color_192.png
index ebd8a8b..04a5a10 100644
--- a/res/drawable-hdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-hdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-mdpi/googlelogo_dark20_color_132x44.png b/res/drawable-mdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index a045dab..0000000
--- a/res/drawable-mdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/googlelogo_dark20_color_184x60.png b/res/drawable-mdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index d1181a9..0000000
--- a/res/drawable-mdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/product_logo_contacts_color_144.png b/res/drawable-mdpi/product_logo_contacts_color_144.png
index e28097c..27c571e 100644
--- a/res/drawable-mdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-mdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-mdpi/product_logo_contacts_color_192.png b/res/drawable-mdpi/product_logo_contacts_color_192.png
index a8fcbf0..6e79412 100644
--- a/res/drawable-mdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-mdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
index 5cc35d5..0272a01 100755
--- a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
+++ b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
@@ -24,11 +24,4 @@
             android:gravity="center"
             android:src="@drawable/product_logo_contacts_color_192" />
     </item>
-    <item
-        android:id="@+id/launchscreens_logo_text"
-        android:bottom="@dimen/launchscreens_google_logo_bottom">
-        <bitmap
-            android:gravity="center_horizontal|bottom"
-            android:src="@drawable/googlelogo_dark20_color_184x60" />
-    </item>
 </layer-list>
diff --git a/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 437f083..0000000
--- a/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 2bd813f..0000000
--- a/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/product_logo_contacts_color_144.png b/res/drawable-xhdpi/product_logo_contacts_color_144.png
index ebd8a8b..04a5a10 100644
--- a/res/drawable-xhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xhdpi/product_logo_contacts_color_192.png b/res/drawable-xhdpi/product_logo_contacts_color_192.png
index 690bbd0..35d80e4 100644
--- a/res/drawable-xhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index b22fba6..0000000
--- a/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 6e4193e..0000000
--- a/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/product_logo_contacts_color_144.png b/res/drawable-xxhdpi/product_logo_contacts_color_144.png
index 8ff6a14..12c582b 100644
--- a/res/drawable-xxhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xxhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xxhdpi/product_logo_contacts_color_192.png b/res/drawable-xxhdpi/product_logo_contacts_color_192.png
index c32d9cd..baa0003 100644
--- a/res/drawable-xxhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xxhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 7372b47..0000000
--- a/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 60de38b..0000000
--- a/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/product_logo_contacts_color_144.png b/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
index c32d9cd..baa0003 100644
--- a/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/product_logo_contacts_color_192.png b/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
index 1346cbc..f1a62e6 100644
--- a/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml
index bacfe69..d30e8e1 100644
--- a/res/drawable/ic_work_profile.xml
+++ b/res/drawable/ic_work_profile.xml
@@ -1,17 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-
-    <!-- //java/com/google/android/assets/quantum:ic_enterprise_grey600_16 -->
-
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#757575"
-        android:pathData="M28 33h-8v-3H6v8c0 2.2 1.8 4 4 4h28c2.2 0 4-1.8
-4-4v-8H28v3zm12-21h-7V9l-3-3H18l-3 3.1V12H8c-2.2 0-4 1.8-4 4v8c0 2.2 1.8 4 4
-4h12v-3h8v3h12c2.2 0 4-1.8 4-4v-8c0-2.2-1.8-4-4-4zm-10 0H18V9h12v3z" />
-    <path
-        android:pathData="M0 0h48v48H0z" />
+        android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"
+        android:fillColor="#7F7F7F"/>
 </vector>
diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml
index 1995899..276b2da 100755
--- a/res/drawable/quantum_launchscreen_contacts.xml
+++ b/res/drawable/quantum_launchscreen_contacts.xml
@@ -24,11 +24,4 @@
         android:gravity="center"
         android:src="@drawable/product_logo_contacts_color_144" />
   </item>
-  <item
-      android:id="@+id/launchscreens_logo_text"
-      android:bottom="@dimen/launchscreens_google_logo_bottom">
-    <bitmap
-        android:gravity="center_horizontal|bottom"
-        android:src="@drawable/googlelogo_dark20_color_132x44" />
-  </item>
 </layer-list>
diff --git a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml b/res/mipmap-anydpi-v26/ic_contacts_launcher.xml
deleted file mode 100644
index 784f6e3..0000000
--- a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_contacts_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_contacts_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_contacts_launcher.png b/res/mipmap-hdpi/ic_contacts_launcher.png
index 0fd1492..64eff00 100644
--- a/res/mipmap-hdpi/ic_contacts_launcher.png
+++ b/res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_contacts_launcher_foreground.png b/res/mipmap-hdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 8088777..0000000
--- a/res/mipmap-hdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_contacts_launcher.png b/res/mipmap-mdpi/ic_contacts_launcher.png
index e23930b..b4ee821 100644
--- a/res/mipmap-mdpi/ic_contacts_launcher.png
+++ b/res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_contacts_launcher_foreground.png b/res/mipmap-mdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index abea159..0000000
--- a/res/mipmap-mdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_contacts_launcher.png b/res/mipmap-xhdpi/ic_contacts_launcher.png
index aff0f31..6feeadf 100644
--- a/res/mipmap-xhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 1fb6752..0000000
--- a/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_contacts_launcher.png b/res/mipmap-xxhdpi/ic_contacts_launcher.png
index 9cd2ebe..01a3fde 100644
--- a/res/mipmap-xxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index f1be7b1..0000000
--- a/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
index 74c4179..328e067 100644
--- a/res/mipmap-xxxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 4b1a4b4..0000000
--- a/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 48ac24b..897838a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kon nie kontakte vanaf SIM-kaart invoer nie"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Voer tans SIM in"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Kennisgewings"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nee"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0a29b4f..2e9a060 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"ከ SIM ካርድ ዕውቂያዎች ማስመጣት አልተቻለም"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ሲም በማምጣት ላይ"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ማሳወቂያዎች"</string>
+    <string name="yes_button" msgid="1268479086848288060">"አዎ"</string>
+    <string name="no_button" msgid="5742815694687835125">"አይ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8e79099..97eb109 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -216,7 +216,7 @@
     <string name="add_new_account" msgid="5748627740680940264">"إضافة حساب جديد"</string>
     <string name="menu_export_database" msgid="2659719297530170820">"تصدير ملفات قاعدة البيانات"</string>
     <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"إنشاء جهة اتصال جديدة"</string>
-    <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"الاطلاع على المزيد"</string>
+    <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"الاطّلاع على المزيد"</string>
     <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"عرض أقل"</string>
     <string name="recent_card_title" msgid="8982782042698001695">"الأخيرة"</string>
     <string name="about_card_title" msgid="2920942314212825637">"حول"</string>
@@ -266,7 +266,7 @@
     <string name="navigation_drawer_label" msgid="4154758025620107419">"التصنيف <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
     <string name="menu_title_groups" msgid="8356921831150278868">"التصنيفات"</string>
     <string name="menu_title_filters" msgid="8210922220185114527">"الحسابات"</string>
-    <string name="permission_explanation_header" msgid="5739405825039695327">"الاطلاع على المحادثات والأحداث التي جمعتكما"</string>
+    <string name="permission_explanation_header" msgid="5739405825039695327">"الاطّلاع على المحادثات والأحداث التي جمعتكما"</string>
     <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"الأحداث والرسائل"</string>
     <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"الأحداث"</string>
     <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"الرسائل"</string>
@@ -486,7 +486,7 @@
     <string name="setting_about" msgid="7014388749752042863">"حول جهات الاتصال"</string>
     <string name="share_favorite_contacts" msgid="4280926751003081042">"مشاركة جهات الاتصال المفضلة"</string>
     <string name="share_contacts" msgid="8109287987498711664">"مشاركة جميع جهات الاتصال"</string>
-    <string name="share_contacts_failure" msgid="1216431977330560559">"أخفقت مشاركة جهات الاتصال."</string>
+    <string name="share_contacts_failure" msgid="1216431977330560559">"تعذّرت مشاركة جهات الاتصال."</string>
     <string name="dialog_export" msgid="1628001095187741417">"تصدير جهات الاتصال"</string>
     <string name="dialog_import" msgid="2423592905927819672">"استيراد جهات اتصال من"</string>
     <string name="share_error" msgid="948429331673358107">"لا يمكن مشاركة جهة الاتصال هذه."</string>
@@ -557,4 +557,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"‏تعذر استيراد جهات الاتصال من شريحة SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"‏استيراد SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"الإشعارات"</string>
+    <string name="yes_button" msgid="1268479086848288060">"نعم"</string>
+    <string name="no_button" msgid="5742815694687835125">"لا"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 4482a9f..7ce1503 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktları SIM kartdan import etmək olmadı"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM import edilir"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirişlər"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Hə"</string>
+    <string name="no_button" msgid="5742815694687835125">"Yox"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index af1b650..b64c873 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Контактите не можаха да се импортират от SIM картата"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импортира се от SIM картата"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Известия"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+    <string name="no_button" msgid="5742815694687835125">"Не"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index dce2ab3..1d5176a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"সিম কার্ড থেকে পরিচিতিগুলি আমদানি করা গেল না"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"সিম আমদানি করা হচ্ছে"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"বিজ্ঞপ্তি"</string>
+    <string name="yes_button" msgid="1268479086848288060">"হ্যাঁ"</string>
+    <string name="no_button" msgid="5742815694687835125">"না"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 091b09e..c14e050 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -22,9 +22,9 @@
     <string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
     <string name="shortcutDialContact" msgid="746622101599186779">"Direktno biranje"</string>
     <string name="shortcutMessageContact" msgid="2460337253595976198">"Direktna poruka"</string>
-    <string name="shortcutActivityTitle" msgid="1504383567778497348">"Izaberi kontakt"</string>
+    <string name="shortcutActivityTitle" msgid="1504383567778497348">"Odaberi kontakt"</string>
     <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodaj u kontakt"</string>
-    <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Izaberi kontakt"</string>
+    <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odaberi kontakt"</string>
     <string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Odaberi"</string>
     <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Napravi novi kontakt"</string>
     <string name="searchHint" msgid="8482945356247760701">"Pretraži kontakte"</string>
@@ -57,7 +57,7 @@
     <string name="menu_linkedContacts" msgid="400444389718855621">"Prikaz povezanih kontakata"</string>
     <string name="menu_save" msgid="1727844363591825909">"Sačuvaj"</string>
     <string name="titleJoinContactDataWith" msgid="6825255752748313944">"Poveži kontakte"</string>
-    <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Izaberite kontakt koji želite povezati s kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
+    <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Odaberite kontakt koji želite povezati s kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
     <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
     <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> je povezan"</string>
@@ -127,7 +127,7 @@
     <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Neki kontakti nemaju brojeve telefona."</string>
     <string name="menu_sendEmailOption" msgid="5978319931321657780">"Pošalji poruku e-pošte"</string>
     <string name="menu_sendMessageOption" msgid="8850168125274916426">"Pošalji poruku"</string>
-    <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Izaberite kontakte"</string>
+    <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Odaberite kontakte"</string>
     <string name="send_to_selection" msgid="2251339182881603540">"Pošalji"</string>
     <string name="listFoundAllContactsZero" msgid="922980883593159444">"Nema kontakata"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Dodati \"<xliff:g id="EMAIL">%s</xliff:g>\" u kontakte?"</string>
@@ -144,7 +144,7 @@
       <item quantity="few">Podijeli kontakte putem</item>
       <item quantity="other">Podijeli kontakte putem</item>
     </plurals>
-    <string name="dialog_new_group_account" msgid="3451312333591556651">"Izaberi račun"</string>
+    <string name="dialog_new_group_account" msgid="3451312333591556651">"Odaberi račun"</string>
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Napravi oznaku"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Preimenuj oznaku"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Naziv oznake"</string>
@@ -155,7 +155,7 @@
     <string name="google_account_type_format" msgid="5283997303922067997">"Račun <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="take_photo" msgid="7496128293167402354">"Snimi fotografiju"</string>
     <string name="take_new_photo" msgid="7341354729436576304">"Snimi novu fotografiju"</string>
-    <string name="pick_photo" msgid="2129509985223564942">"Izaberi fotografiju"</string>
+    <string name="pick_photo" msgid="2129509985223564942">"Odaberi fotografiju"</string>
     <string name="pick_new_photo" msgid="9122450996263688237">"Odaberi novu fotografiju"</string>
     <string name="search_results_searching" msgid="3984833028938569930">"Pretraživanje…"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
@@ -192,11 +192,11 @@
     <string name="external_profile_title" msgid="8034998767621359438">"Moj profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Odvojite malo vremena da dodate račun putem kojeg će se kontakti sigurnosno kopirati na Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Novi kontakti će biti sačuvani na račun <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
-    <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izaberite zadani račun za nove kontakte:"</string>
+    <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Odaberite zadani račun za nove kontakte:"</string>
     <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Napravi novi kontakt"</string>
     <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Uredi kontakt"</string>
     <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Samo prikaz"</string>
-    <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Izaberite kontakt za uređivanje"</string>
+    <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Odaberite kontakt za uređivanje"</string>
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Povezani kontakti"</string>
     <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Dodaj"</string>
     <string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Prekini povezanost"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ef0c46d..9d91b9e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"No s\'han pogut importar els contactes de la targeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"S\'estan important els contactes de la SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificacions"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 25afdb4..069c845 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakty ze SIM karty se nepodařilo importovat"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importování ze SIM karty"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Oznámení"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ano"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ne"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 21b9105..bae027d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktpersonerne kunne ikke importeres fra SIM-kortet"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kortet importeres"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Underretninger"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nej"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 803c8e4..804cd7a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakte konnten nicht von SIM-Karte importiert werden"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM wird importiert"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Benachrichtigungen"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nein"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 38c72b6..ea52f82 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Δεν ήταν δυνατή η εισαγωγή επαφών από την κάρτα SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Εισαγωγή από SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ειδοποιήσεις"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ναι"</string>
+    <string name="no_button" msgid="5742815694687835125">"Όχι"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d31ce21..0298097 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d31ce21..0298097 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d31ce21..0298097 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index deb32e9..eaad2c4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"No se pudieron importar los contactos de la tarjeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando la tarjeta SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones."</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c03263a..302e97c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"No se han podido importar los contactos de la tarjeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se está importando la tarjeta SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index a70087e..f4c2c06 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakte ei õnnestunud SIM-kaardilt importida"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kaardi importimine"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Märguanded"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Jah"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ei"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d9f6e64..e8943af 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Ezin izan dira inportatu SIM txarteleko kontaktuak"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM txartela inportatzen"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Jakinarazpenak"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Bai"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ez"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 12a153f..4fcedb1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"مخاطبین از سیم کارت وارد نشدند"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"وارد کردن سیم کارت"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"اعلان‌ها"</string>
+    <string name="yes_button" msgid="1268479086848288060">"بله"</string>
+    <string name="no_button" msgid="5742815694687835125">"نه"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a2f4a5f..997f6b4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Yhteystietojen tuominen SIM-kortilta epäonnistui."</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Tuodaan SIM-kortin yhteystietoja"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ilmoitukset"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Kyllä"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ei"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a600987..00b7ae8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer des contacts à partir de la carte SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation des contacts SIM en cours…"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Avis"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Oui"</string>
+    <string name="no_button" msgid="5742815694687835125">"Non"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 20e412b..f9d6a28 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer les contacts depuis la carte SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation depuis la carte SIM..."</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Oui"</string>
+    <string name="no_button" msgid="5742815694687835125">"Non"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ec72d11..70e6514 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Non se puideron importar os contactos da tarxeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificacións"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Si"</string>
+    <string name="no_button" msgid="5742815694687835125">"Non"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 26a6250..e94cbad 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM કાર્ડમાંથી સંપર્કો આયાત કરી શક્યાં નથી"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM આયાત કરી રહ્યાં છે"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"સૂચનાઓ"</string>
+    <string name="yes_button" msgid="1268479086848288060">"હા"</string>
+    <string name="no_button" msgid="5742815694687835125">"ના"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9326229..d1ccfcb 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -240,7 +240,7 @@
     <string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"अभी नहीं"</string>
     <string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"यह संपर्क"</string>
     <string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"संभावित कॉपी"</string>
-    <string name="suggestion_card_help_message" msgid="4474061044387181093">"हो सकता है कि ये संपर्क एक ही व्‍यक्‍ति हो. आप उन्हें एकल संपर्क के रूप में एक साथ लिंक कर सकते हैं."</string>
+    <string name="suggestion_card_help_message" msgid="4474061044387181093">"हो सकता है कि ये संपर्क एक ही व्‍यक्‍ति हो. आप उन्हें एक ही संपर्क के रूप में एक साथ लिंक कर सकते हैं."</string>
     <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> हटाएं"</string>
     <string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> हटाएं"</string>
     <string name="menu_assistant" msgid="5760693735722052454">"सुझाव"</string>
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्ड से संपर्क आयात नहीं किए जा सके"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM को आयात किया जा रहा है"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"नोटिफ़िकेशन"</string>
+    <string name="yes_button" msgid="1268479086848288060">"हां"</string>
+    <string name="no_button" msgid="5742815694687835125">"नहीं"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 109bdbd..05fbba1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -536,4 +536,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Uvoz kontakata sa SIM kartice nije moguć"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz SIM kontakata"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavijesti"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ne"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 064f606..9b2ee94 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Nem sikerült importálni a névjegyeket a SIM-kártyáról"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kártya importálása folyamatban"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Értesítések"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Igen"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nem"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index b8fb7ea..9bec260 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Չհաջողվեց կոնտակտներ ներմուծել SIM քարտից"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM քարտի ներմուծում"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ծանուցումներ"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Այո"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ոչ"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cfc8607..6bfcb61 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,7 +52,7 @@
     <string name="joinConfirmation" msgid="8262614843581924365">"Ingin menyimpan perubahan yang sudah dilakukan dan menautkan dengan kontak yang dipilih?"</string>
     <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Simpan dan Tautkan"</string>
     <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Menautkan"</string>
-    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Membatalkan tautan"</string>
+    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Membatalkan link"</string>
     <string name="menu_joinAggregate" msgid="3599512127797513606">"Tautkan"</string>
     <string name="menu_linkedContacts" msgid="400444389718855621">"Lihat kontak yang ditautkan"</string>
     <string name="menu_save" msgid="1727844363591825909">"Simpan"</string>
@@ -250,7 +250,7 @@
     <string name="navigation_drawer_label" msgid="4154758025620107419">"Label <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
     <string name="menu_title_groups" msgid="8356921831150278868">"Label"</string>
     <string name="menu_title_filters" msgid="8210922220185114527">"Akun"</string>
-    <string name="permission_explanation_header" msgid="5739405825039695327">"Lihat riwayat bersama"</string>
+    <string name="permission_explanation_header" msgid="5739405825039695327">"Lihat histori bersama"</string>
     <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Acara dan pesan"</string>
     <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Acara"</string>
     <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Pesan"</string>
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimpor kontak dari kartu SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimpor SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifikasi"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ya"</string>
+    <string name="no_button" msgid="5742815694687835125">"Tidak"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c94e07c..4d68b61 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Gat ekki flutt inn tengiliði af SIM-korti"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Flytur inn SIM-kort"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Tilkynningar"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Já"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nei"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 65d0101..52c7b65 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossibile importare i contatti dalla scheda SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importazione della SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifiche"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sì"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 206a001..7a5fae2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"‏לא ניתן היה לייבא את אנשי הקשר מכרטיס ה-SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"‏הייבוא מכרטיס ה-SIM מתבצע"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"הודעות"</string>
+    <string name="yes_button" msgid="1268479086848288060">"כן"</string>
+    <string name="no_button" msgid="5742815694687835125">"לא"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ce25290..a3dac06 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM カードの連絡先をインポートできませんでした"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM からインポートしています"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+    <string name="yes_button" msgid="1268479086848288060">"はい"</string>
+    <string name="no_button" msgid="5742815694687835125">"いいえ"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index cf9fd75..c751904 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ბარათიდან კონტაქტების იმპორტი ვერ შესრულდა"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"მიმდინარეობს SIM-ის იმპორტი"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"შეტყობინებები"</string>
+    <string name="yes_button" msgid="1268479086848288060">"დიახ"</string>
+    <string name="no_button" msgid="5742815694687835125">"არა"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1c8e82d..a3dd957 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Контактілерді SIM картасынан импорттау мүмкін болмады"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM картасы импортталуда"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Хабарландырулар"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Иә"</string>
+    <string name="no_button" msgid="5742815694687835125">"Жоқ"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 78c1780..7a49f8b 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"មិន​អាច​នាំចូល​ទំនាក់ទំនង​ពី​ស៊ីម​កាត​បាន​ទេ"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"កំពុង​នាំចូល​ទំនាក់ទំនង​​ពី SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ការ​ជូនដំណឹង"</string>
+    <string name="yes_button" msgid="1268479086848288060">"បាទ/ចាស"</string>
+    <string name="no_button" msgid="5742815694687835125">"ទេ"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 903105e..a96eb44 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ಸಿಮ್‌ ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ಹೌದು"</string>
+    <string name="no_button" msgid="5742815694687835125">"ಇಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 347aac7..c91009f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM 카드에서 연락처를 가져올 수 없습니다."</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM 가져오는 중"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"알림"</string>
+    <string name="yes_button" msgid="1268479086848288060">"예"</string>
+    <string name="no_button" msgid="5742815694687835125">"아니요"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 1334789..f92dda8 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM-картадан байланыштар импорттолбой койду"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-картадан өткөрүлүп алынууда"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Эскертмелер"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ооба"</string>
+    <string name="no_button" msgid="5742815694687835125">"Жок"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index baa5c6b..b16fb0f 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"ບໍ່ສາມາດນຳເຂົ້າລາຍຊື່ຜູ້ຕິດຕໍ່ຈາກຊິມກາດໄດ້"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ກຳລັງນຳເຂົ້າຈາກ SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ການແຈ້ງເຕືອນ"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ແມ່ນ"</string>
+    <string name="no_button" msgid="5742815694687835125">"ບໍ່"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 71d9740..42d90b9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Nepavyko importuoti kontaktų iš SIM kortelės"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuojami SIM kortelės kontaktai"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Pranešimai"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Taip"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ne"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 71c8329..fbdefda 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -536,4 +536,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Nevarēja importēt kontaktpersonas no SIM kartes."</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Notiek SIM kartes importēšana"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Paziņojumi"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Jā"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nē"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index b7b28db..196d097 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Не можеше да се увезат контакти од SIM-картичката"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Се увезува SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Известувања"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+    <string name="no_button" msgid="5742815694687835125">"Не"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index fc724ef..6540a72 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"സിം കാർഡിൽ നിന്ന്‌ കോൺടാക്‌റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"അറിയിപ്പുകൾ"</string>
+    <string name="yes_button" msgid="1268479086848288060">"അതെ"</string>
+    <string name="no_button" msgid="5742815694687835125">"ഇല്ല"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 266ffd9..2c1a965 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM картнаас харилцагчдыг импортолж чадсангүй"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-г импорт хийж байна"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Мэдэгдэл"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Тийм"</string>
+    <string name="no_button" msgid="5742815694687835125">"Үгүй"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 4aa7917..12f9fc7 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -48,14 +48,14 @@
     <string name="splitConfirmation" msgid="7342030840130187290">"एकाधिक संपर्कांमध्‍ये या संपर्काचा दुवा रद्द करायचा?"</string>
     <string name="splitConfirmation_positive_button" msgid="9129409098807939699">"दुवा रद्द करा"</string>
     <string name="splitConfirmationWithPendingChanges" msgid="7719062163511895696">"आपण आधीपासून केलेले बदल आपण जतन करू आणि एकाधिक संपर्कांमध्‍ये या संपर्काचा दुवा रद्द करू इच्छिता?"</string>
-    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"जतन करा आणि दुवा रद्द करा"</string>
+    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"सेव्ह करा आणि दुवा रद्द करा"</string>
     <string name="joinConfirmation" msgid="8262614843581924365">"आपण आधीपासून केलेले बदल आपण जतन करू आणि निवडलेल्या संपर्काशी दुवा जोडू इच्छिता?"</string>
-    <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"जतन करा आणि दुवा जोडा"</string>
+    <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"सेव्ह करा आणि दुवा जोडा"</string>
     <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"दुवा साधत आहे"</string>
     <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"दुवा रद्द करत आहे"</string>
     <string name="menu_joinAggregate" msgid="3599512127797513606">"दुवा साधा"</string>
     <string name="menu_linkedContacts" msgid="400444389718855621">"दुवा जोडलेले संपर्क"</string>
-    <string name="menu_save" msgid="1727844363591825909">"जतन करा"</string>
+    <string name="menu_save" msgid="1727844363591825909">"सेव्ह करा"</string>
     <string name="titleJoinContactDataWith" msgid="6825255752748313944">"संपर्कांचा दुवा साधा"</string>
     <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"आपण <xliff:g id="NAME">%s</xliff:g> सह ज्या संपर्काचा दुवा जोडू इच्छिता तो निवडा:"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"सूचित संपर्क"</string>
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="5102411903247859575">"या लेबलसह कोणतेही संपर्क नाहीत"</string>
     <string name="emptyAccount" msgid="6873962901497975964">"या खात्यामध्ये कोणतेही संपर्क नाहीत"</string>
     <string name="emptyMainList" msgid="2772242747899664460">"आपली संपर्क सूची रिक्त आहे"</string>
-    <string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> जतन केले"</string>
+    <string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> सेव्ह केले"</string>
     <string name="contactSavedToast" msgid="9171862279493213075">"संपर्क जतन केला"</string>
     <string name="contactUnlinkedToast" msgid="7122823195786012553">"संपर्कांचा दुवा रद्द केला"</string>
     <string name="contactSavedErrorToast" msgid="4827033473908688031">"संपर्क बदल जतन करणे शक्य झाले नाही"</string>
@@ -187,7 +187,7 @@
     <string name="local_profile_title" msgid="2021416826991393684">"माझे स्थानिक प्रोफाइल"</string>
     <string name="external_profile_title" msgid="8034998767621359438">"माझे <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> प्रोफाईल"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Google वर आपल्या संपर्कांचा बॅक अप घेणारे खाते जोडण्‍यासाठी एक मिनिट घ्या."</string>
-    <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"नवीन संपर्क <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> वर जतन केले जातील."</string>
+    <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"नवीन संपर्क <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> वर सेव्ह केले जातील."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"नवीन संपर्कांसाठी एक डीफॉल्ट खाते निवडा:"</string>
     <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"नवीन संपर्क तयार करा"</string>
     <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"संपर्क संपादित करा"</string>
@@ -204,7 +204,7 @@
     <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"कमी पहा"</string>
     <string name="recent_card_title" msgid="8982782042698001695">"अलीकडील"</string>
     <string name="about_card_title" msgid="2920942314212825637">"विषयी"</string>
-    <string name="toast_making_personal_copy" msgid="288549957278065542">"वैयक्तिक प्रत तयार करीत आहे..."</string>
+    <string name="toast_making_personal_copy" msgid="288549957278065542">"वैयक्तिक प्रत तयार करत आहे..."</string>
     <string name="tomorrow" msgid="6241969467795308581">"उद्या"</string>
     <string name="today" msgid="8041090779381781781">"आज"</string>
     <string name="today_at_time_fmt" msgid="605665249491030460">"आज <xliff:g id="TIME_INTERVAL">%s</xliff:g> वाजता"</string>
@@ -234,7 +234,7 @@
     <string name="editor_add_photo_content_description" msgid="4194479313465418120">"संपर्क फोटो जोडा"</string>
     <string name="editor_contact_photo_content_description" msgid="8571975622926162369">"संपर्क फोटो"</string>
     <string name="editor_failed_to_load" msgid="1623639078580475818">"संपादक उघडण्यात अयशस्वी."</string>
-    <string name="editor_account_selector_title" msgid="4426337993307015833">"यावर जतन करीत आहे"</string>
+    <string name="editor_account_selector_title" msgid="4426337993307015833">"यावर जतन करत आहे"</string>
     <string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"<xliff:g id="ACCOUNT">%s</xliff:g> वरील संपर्क माहिती संपादनयोग्य नाही"</string>
     <string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"संपर्कांचा दुवा साधा"</string>
     <string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"रद्द करा"</string>
@@ -304,7 +304,7 @@
     <string name="description_video_call" msgid="7120921378651700947">"व्‍हिडिओ कॉल करा"</string>
     <string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"वारंवार सपर्क साधलेले साफ करायचे?"</string>
     <string name="clearFrequentsConfirmation" msgid="2270554975938265734">"आपण संपर्क आणि फोन अ‍ॅप्‍स मधील वारंवार संपर्क साधलेली सूची साफ कराल आणि ईमेल अ‍ॅप्‍सना सुरवातीपासून आपली पत्ता प्राधान्‍ये जाणून घेण्‍याची सक्ती कराल."</string>
-    <string name="clearFrequentsProgress_title" msgid="5157001637482794212">"वारंवार सपर्क साधलेले साफ करीत आहे..."</string>
+    <string name="clearFrequentsProgress_title" msgid="5157001637482794212">"वारंवार सपर्क साधलेले साफ करत आहे..."</string>
     <string name="status_available" msgid="5586870015822828392">"उपलब्ध"</string>
     <string name="status_away" msgid="1838861100379804730">"दूर आहे"</string>
     <string name="status_busy" msgid="9147992455450257136">"व्यस्त"</string>
@@ -392,7 +392,7 @@
     <string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"संकालन करा मधून \"<xliff:g id="GROUP">%s</xliff:g>\" हटविल्‍याने संकालन करा मधून कोणत्‍याही गटबद्ध न केलेल्‍या संपर्कांना देखील हटवेल."</string>
     <string name="savingDisplayGroups" msgid="2133152192716475939">"प्रदर्शन पर्याय जतन करत आहे…"</string>
     <string name="listCustomView" msgid="1840624396582117590">"सानुकूलित दृश्य"</string>
-    <string name="dialog_new_contact_account" msgid="4969619718062454756">"आयात केलेले संपर्क यावर जतन करा:"</string>
+    <string name="dialog_new_contact_account" msgid="4969619718062454756">"आयात केलेले संपर्क यावर सेव्ह करा:"</string>
     <string name="import_from_sim" msgid="6912071635295799131">"सिम कार्ड"</string>
     <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"सिम <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
     <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
@@ -423,14 +423,14 @@
     <string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"संपर्क निर्यात करणे समाप्त झाले, संपर्क सामायिक करण्यासाठी सूचनेवर क्लिक करा."</string>
     <string name="touch_to_share_contacts" msgid="4882485525268469736">"संपर्क सामायिक करण्यासाठी टॅप करा."</string>
     <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात करणे रद्द केले."</string>
-    <string name="exporting_contact_list_title" msgid="9072240631534457415">"संपर्क डेटा निर्यात करीत आहे"</string>
+    <string name="exporting_contact_list_title" msgid="9072240631534457415">"संपर्क डेटा निर्यात करत आहे"</string>
     <string name="exporting_contact_list_message" msgid="3367949209642931952">"संपर्क डेटा निर्यात केला जात आहे."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"डेटाबेस माहिती मिळवू शकलो नाही."</string>
     <string name="composer_has_no_exportable_contact" msgid="5712531702823346549">"कोणतेही निर्यात करण्यायोग्य संपर्क नाहीत."</string>
     <string name="composer_not_initialized" msgid="2321648986367005254">"vCard रचनाकाराने योग्‍यरित्‍या प्रारंभ केला नाही."</string>
     <string name="exporting_contact_failed_title" msgid="4892358112409576342">"निर्यात करू शकलो नाही"</string>
     <string name="exporting_contact_failed_message" msgid="4938527850142003141">"संपर्क डेटा निर्यात केला नाही.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> आयात करीत आहे"</string>
+    <string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> आयात करत आहे"</string>
     <string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard डेटा वाचू शकलो नाही"</string>
     <string name="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> आयात करणे समाप्त झाले"</string>
     <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"<xliff:g id="FILENAME">%s</xliff:g> आयात करणे रद्द झाले"</string>
@@ -440,10 +440,10 @@
     <string name="contacts_export_will_start_message" msgid="8538705791417534431">"संपर्क लवकरच निर्यात केले जातील."</string>
     <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard निर्यात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="vcard_unknown_filename" msgid="7171709890959915954">"संपर्क"</string>
-    <string name="caching_vcard_message" msgid="4926308675041506756">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅश   करीत आहे. वास्‍तविक आयात लवकरच प्रारंभ होईल."</string>
+    <string name="caching_vcard_message" msgid="4926308675041506756">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅश   करत आहे. वास्‍तविक आयात लवकरच प्रारंभ होईल."</string>
     <string name="vcard_import_failed" msgid="5223531255894842406">"vCard आयात करू शकलो नाही."</string>
     <string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC वर संपर्क प्राप्त केला"</string>
-    <string name="caching_vcard_title" msgid="1226272312940516605">"कॅश   करीत आहे"</string>
+    <string name="caching_vcard_title" msgid="1226272312940516605">"कॅश   करत आहे"</string>
     <string name="progress_notifier_message" msgid="2311011466908220528">"आयात करत आहे <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="4407527157056120858">".vcf फाईलवर निर्यात करा"</string>
     <string name="display_options_sort_list_by" msgid="7028809117272018712">"नुसार क्रमवारी लावा"</string>
@@ -470,7 +470,7 @@
     <string name="menu_contacts_filter" msgid="2165153460860262501">"प्रदर्शित करण्यासाठी संपर्क"</string>
     <string name="activity_title_contacts_filter" msgid="8275542497615516969">"प्रदर्शित करण्यासाठी संपर्क"</string>
     <string name="custom_list_filter" msgid="9048525797111024204">"दृश्य सानुकूल करा"</string>
-    <string name="menu_custom_filter_save" msgid="2679793632208086460">"जतन करा"</string>
+    <string name="menu_custom_filter_save" msgid="2679793632208086460">"सेव्ह करा"</string>
     <string name="hint_findContacts" msgid="7128627979899070325">"संपर्क शोधा"</string>
     <string name="contactsFavoritesLabel" msgid="8417039765586853670">"आवडते"</string>
     <string name="menu_import" msgid="6107961135813836467">"आयात करा"</string>
@@ -527,6 +527,8 @@
     <string name="importing_sim_finished_title" msgid="5196369441294050721">"सिम कार्ड आयात करणे समाप्त झाले"</string>
     <string name="importing_sim_failed_title" msgid="39706901030537985">"आयात अयशस्वी झाले"</string>
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"सिम कार्ड वरून संपर्क आयात करणेे शक्य झाले नाही"</string>
-    <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करीत आहे"</string>
+    <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करत आहे"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचना"</string>
+    <string name="yes_button" msgid="1268479086848288060">"होय"</string>
+    <string name="no_button" msgid="5742815694687835125">"नाही"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index fa06426..2407346 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimport kenalan daripada kad SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimport SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Pemberitahuan"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ya"</string>
+    <string name="no_button" msgid="5742815694687835125">"Tidak"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index bf2c84d..8f95a31 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"ဆင်းမ်ကဒ်မှ အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ဆင်းမ်ကဒ်ကို တင်သွင်းနေသည်"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"အကြောင်းကြားချက်များ"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+    <string name="no_button" msgid="5742815694687835125">"No"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 961edd5..9db3f4e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kunne ikke importére kontakter fra SIM-kortet"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerer fra SIM-kortet"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Varsler"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nei"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0dd7ed8..f592142 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्डबाट सम्पर्कहरू आयात गर्न सकिएन"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM आयात गरिँदै"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचनाहरू"</string>
+    <string name="yes_button" msgid="1268479086848288060">"हुन्छ"</string>
+    <string name="no_button" msgid="5742815694687835125">"हुँदैन"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6caa088..f95afc1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kan geen contacten importeren van de simkaart"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Sim importeren"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Meldingen"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nee"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 25a381e..9e90fc8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ਕਾਰਡ ਤੋਂ ਸੰਪਰਕ ਆਯਾਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ਸਿਮ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ਹਾਂ"</string>
+    <string name="no_button" msgid="5742815694687835125">"ਨਹੀਂ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c18ad3c..061316b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Nie udało się zaimportować kontaktów z karty SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuję kontakty z karty SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Powiadomienia"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Tak"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nie"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index d0148d8..a9c1603 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar os contatos do cartão SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+    <string name="no_button" msgid="5742815694687835125">"Não"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f60f241..047cc7c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar contactos do cartão SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"A importar SIM…"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+    <string name="no_button" msgid="5742815694687835125">"Não"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d0148d8..a9c1603 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar os contatos do cartão SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+    <string name="no_button" msgid="5742815694687835125">"Não"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 109b71f..5b49d0c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -536,4 +536,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Nu s-a putut importa agenda de pe cardul SIM."</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se importă cardul SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificări"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nu"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 97e8d9b..7967569 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Не удалось импортировать контакты с SIM-карты"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импорт контактов с SIM-карты…"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Уведомления"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+    <string name="no_button" msgid="5742815694687835125">"Нет"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9b7e7a7..db0dd0f 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"සම්බන්ධතා SIM කාඩ්පතෙන් ආයාත කිරීමට නොහැකි විය"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM ආයාත කරමින්"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"දැනුම් දීම්"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ඔව්"</string>
+    <string name="no_button" msgid="5742815694687835125">"නැත"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9f8d415..7e59774 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Nepodarilo sa importovať kontakty zo SIM karty"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuje sa SIM karta"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Upozornenia"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Áno"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nie"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index eea2486..b909a3a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Stikov s kartic SIM ni bilo mogoče uvoziti"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvažanje kartice SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obvestila"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ne"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 51f6988..e8bdde2 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktet nga karta SIM nuk mund të importoheshin"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Karta SIM po importohet"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Njoftime"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Po"</string>
+    <string name="no_button" msgid="5742815694687835125">"Jo"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3f3f083..003547d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -536,4 +536,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Увоз контаката са SIM картице није успео"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Увози се са SIM-а"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Обавештења"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+    <string name="no_button" msgid="5742815694687835125">"Не"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cb2d040..1345432 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Det gick inte att importera kontakter från SIM-kortet"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerar SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Meddelanden"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+    <string name="no_button" msgid="5742815694687835125">"Nej"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2a2abe9..c50b779 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -421,7 +421,7 @@
     <string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Imemaliza kuhamisha <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="6060472638008218274">"Anwani zimehamishwa."</string>
     <string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"Anwani zimehamishwa; bofya arifa ili ushiriki anwani."</string>
-    <string name="touch_to_share_contacts" msgid="4882485525268469736">"Gonga ili ushiriki anwani."</string>
+    <string name="touch_to_share_contacts" msgid="4882485525268469736">"Gusa ili ushiriki anwani."</string>
     <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Kuhamisha <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa"</string>
     <string name="exporting_contact_list_title" msgid="9072240631534457415">"Inahamisha data ya anwani"</string>
     <string name="exporting_contact_list_message" msgid="3367949209642931952">"Data ya anwani inahamishwa."</string>
@@ -515,9 +515,9 @@
     <string name="sim_import_failed_toast" msgid="5559267299793622705">"Imeshindwa kuleta anwani zilizo kwenye SIM kadi"</string>
     <string name="sim_import_title" msgid="2511154832820812822">"Leta kutoka kwenye SIM kadi"</string>
     <string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Ghairi"</string>
-    <string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gonga ili uuwashe."</string>
+    <string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gusa ili uuwashe."</string>
     <string name="dismiss_sync_alert" msgid="8941131776605093596">"Ondoa"</string>
-    <string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gonga ili uuwashe."</string>
+    <string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gusa ili uuwashe."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Je, unataka kuwasha usawazishaji wa kiotomatiki?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Mabadiliko utakayofanya katika programu na akaunti zote, wala si katika Anwani tu, yatasawazishwa kwenye wavuti na kwenye vifaa vyako."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Washa"</string>
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Imeshindwa kuleta anwani kutoka kwenye SIM kadi"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Anwani zilizo kwenye SIM kadi zinaletwa"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Arifa"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ndiyo"</string>
+    <string name="no_button" msgid="5742815694687835125">"La"</string>
 </resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 7d9eb33..7a0fce5 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -17,7 +17,6 @@
     <!-- Copied from java/com/google/android/assets/launchscreens/res/values-sw600dp-land-v21/dimens.xml -->
     <!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
     <dimen name="launchscreens_product_logo_bottom">72dp</dimen>
-    <dimen name="launchscreens_google_logo_bottom">96dp</dimen>
 
     <!-- Height for the image for empty group view-->
     <dimen name="empty_view_image_height">180dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index a38364c..18b43d9 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -17,7 +17,6 @@
     <!-- Copied from java/com/google/android/assets/launchscreens/res/values-sw600dp-port-v21/dimens.xml -->
     <!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
     <dimen name="launchscreens_product_logo_bottom">72dp</dimen>
-    <dimen name="launchscreens_google_logo_bottom">96dp</dimen>
 
     <dimen name="editor_type_label_width">122dip</dimen>
     <dimen name="shortcut_icon_size">64dip</dimen>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4794935..bc39fb6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"சிம் கார்டிலிருந்து தொடர்புகளை இறக்க முடியவில்லை"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"சிம் கார்டை இறக்குகிறது"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"அறிவிப்புகள்"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ஆம்"</string>
+    <string name="no_button" msgid="5742815694687835125">"இல்லை"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 327fb29..02ee273 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM కార్డ్ నుండి పరిచయాలను దిగుమతి చేయలేకపోయింది"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIMను దిగుమతి చేస్తోంది"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"నోటిఫికేషన్‌లు"</string>
+    <string name="yes_button" msgid="1268479086848288060">"అవును"</string>
+    <string name="no_button" msgid="5742815694687835125">"కాదు"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6121f28..515a919 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"นำเข้ารายชื่อติดต่อจากซิมการ์ดไม่ได้"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"กำลังนำเข้าจากซิมการ์ด"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"การแจ้งเตือน"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ใช่"</string>
+    <string name="no_button" msgid="5742815694687835125">"ไม่"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5ad346f..769360c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Hindi ma-import ang mga contact mula sa SIM card"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ini-import ang SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Mga Notification"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Oo"</string>
+    <string name="no_button" msgid="5742815694687835125">"Hindi"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c4af9bd..d6a0ef7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM karttaki kişiler içe aktarılamadı"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM kişileri içe aktarılıyor"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirimler"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Evet"</string>
+    <string name="no_button" msgid="5742815694687835125">"Hayır"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f5d40ec..35acee8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -543,4 +543,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Не вдалось імпортувати контакти із SIM-карти"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Імпорт SIM-карти"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Сповіщення"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Так"</string>
+    <string name="no_button" msgid="5742815694687835125">"Ні"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f3b5b41..b92c73c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"‏SIM کارڈ سے رابطے درآمد نہیں ہو سکے"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"‏SIM درآمد ہو رہی ہے"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"اطلاعات"</string>
+    <string name="yes_button" msgid="1268479086848288060">"ہاں"</string>
+    <string name="no_button" msgid="5742815694687835125">"نہیں"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 4981f7f..7b12ce2 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -521,7 +521,7 @@
     <string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Avto sinxronlash yoqilsinmi?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Ilova va hisoblarga kiritgan o‘zgarishlar (nafaqat Google Kontaktlar), ularning veb-versiyalaridan qurilmalarga avtomatik sinxronlanadi."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Yoqish"</string>
-    <string name="connection_error_message" msgid="7046408921529247089">"Aloqa yo‘q"</string>
+    <string name="connection_error_message" msgid="7046408921529247089">"Internetga ulanmagansiz"</string>
     <string name="single_sim_display_label" msgid="6985770499439371497">"SIM karta"</string>
     <string name="show_more_content_description" msgid="4277410425912984722">"Yana"</string>
     <string name="importing_sim_finished_title" msgid="5196369441294050721">"Kontaktlar SIM kartadan import qilindi"</string>
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktlarni SIM kartadan import qilib bo‘lmadi."</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Kontakt. SIM kartadan import qilinmoqda…"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirishnomalar"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Ha"</string>
+    <string name="no_button" msgid="5742815694687835125">"Yo‘q"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b985cdb..9e32cf6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Không thể nhập liên hệ từ thẻ SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Đang nhập SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Thông báo"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Có"</string>
+    <string name="no_button" msgid="5742815694687835125">"Không"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f6e7a3a..2da207c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"无法导入 SIM 卡中的联系人"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在导入 SIM 卡联系人"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+    <string name="yes_button" msgid="1268479086848288060">"是"</string>
+    <string name="no_button" msgid="5742815694687835125">"否"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 52a9f44..b8a86bb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"無法從 SIM 卡匯入聯絡人"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+    <string name="yes_button" msgid="1268479086848288060">"是"</string>
+    <string name="no_button" msgid="5742815694687835125">"否"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b406ddf..a07c254 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"無法從 SIM 卡匯入聯絡人資料"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡資料"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+    <string name="yes_button" msgid="1268479086848288060">"是"</string>
+    <string name="no_button" msgid="5742815694687835125">"否"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 60fc113..be1e4bd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -529,4 +529,6 @@
     <string name="importing_sim_failed_message" msgid="3345258302998021066">"Ayikwazanga ukungenisa oxhumana nabo kusukela ku-SIM card"</string>
     <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ingenisa i-SIM"</string>
     <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Izaziso"</string>
+    <string name="yes_button" msgid="1268479086848288060">"Yebo"</string>
+    <string name="no_button" msgid="5742815694687835125">"Cha"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e311ff3..aeba877 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,8 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Adaptive icon background layer color -->
-    <color name="ic_contacts_launcher_background">#2458CA</color>
     <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
 
     <!-- 87% black -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c14d396..f92cf79 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,7 +19,6 @@
     <!-- Copied from java/com/google/android/assets/launchscreens/res/values-port-v21/dimens.xml -->
     <!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
     <dimen name="launchscreens_product_logo_bottom">64dp</dimen>
-    <dimen name="launchscreens_google_logo_bottom">104dp</dimen>
 
     <!-- Initial height of transparent space above QuickContacts -->
     <dimen name="quickcontact_starting_empty_height">150dp</dimen>
diff --git a/src/com/android/contacts/CallUtil.java b/src/com/android/contacts/CallUtil.java
index 7172766..bba1faa 100644
--- a/src/com/android/contacts/CallUtil.java
+++ b/src/com/android/contacts/CallUtil.java
@@ -19,18 +19,23 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
+import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.PhoneAccountSdkCompat;
 import com.android.contacts.util.PermissionsUtil;
 import com.android.contacts.util.PhoneNumberHelper;
 import com.android.contactsbind.FeedbackHelper;
+import com.android.contactsbind.experiments.Flags;
 import com.android.phone.common.PhoneConstants;
 
 import java.util.List;
@@ -61,6 +66,14 @@
      */
     public static final int VIDEO_CALLING_PRESENCE = 2;
 
+    /** {@link PhoneAccount#EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK} */
+    private static final String EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK =
+            "android.telecom.extra.SUPPORTS_VIDEO_CALLING_FALLBACK";
+
+    /** {@link CarrierConfigManager#CONFIG_ALLOW_VIDEO_CALLING_FALLBACK} */
+    private static final String CONFIG_ALLOW_VIDEO_CALLING_FALLBACK =
+            "allow_video_calling_fallback_bool";
+
     /**
      * Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined
      * automatically.
@@ -210,4 +223,66 @@
         }
 
     }
+
+    /**
+     * Determines if we're able to use Tachyon as a fallback for video calling.
+     *
+     * @param context The context.
+     * @return {@code true} if there exists a call capable phone account which supports using a
+     * fallback for video calling, the carrier configuration supports a fallback, and the
+     * experiment for using a fallback is enabled. Otherwise {@code false} is returned.
+     */
+    public static boolean isTachyonEnabled(Context context) {
+        // Need to be able to read phone state, and be on at least N to check PhoneAccount extras.
+        if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
+                || !CompatUtils.isNCompatible()) {
+            return false;
+        }
+        TelecomManager telecommMgr = (TelecomManager)
+                context.getSystemService(Context.TELECOM_SERVICE);
+        if (telecommMgr == null) {
+            return false;
+        }
+        try {
+            List<PhoneAccountHandle> accountHandles = telecommMgr.getCallCapablePhoneAccounts();
+            for (PhoneAccountHandle accountHandle : accountHandles) {
+                PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);
+                if (account == null) {
+                    continue;
+                }
+                // Check availability for the device config.
+                final Bundle accountExtras = account.getExtras();
+                final boolean deviceEnabled = accountExtras != null && accountExtras.getBoolean(
+                        EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK);
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Device video fallback config: " + deviceEnabled);
+                }
+
+                // Check availability from carrier config.
+                final PersistableBundle carrierConfig = context.getSystemService(
+                        CarrierConfigManager.class).getConfig();
+                final boolean carrierEnabled =
+                        carrierConfig != null && carrierConfig.getBoolean(
+                                CONFIG_ALLOW_VIDEO_CALLING_FALLBACK);
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Carrier video fallback config: " + carrierEnabled);
+                }
+
+                // Check experiment value.
+                final boolean experimentEnabled = Flags.getInstance().getBoolean(
+                        Experiments.QUICK_CONTACT_VIDEO_CALL);
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Experiment video fallback config: " + experimentEnabled);
+                }
+
+                // All three checks above must be true to enable Tachyon calling.
+                return deviceEnabled && carrierEnabled && experimentEnabled;
+            }
+            return false;
+        } catch (SecurityException e) {
+            FeedbackHelper.sendFeedback(context, TAG,
+                    "Security exception when getting call capable phone accounts", e);
+            return false;
+        }
+    }
 }
diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index fc0d05a..ac950d9 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -297,6 +297,7 @@
         final ShortcutInfo.Builder builder = new ShortcutInfo.Builder(mContext, id)
                 .setIntent(action)
                 .setIcon(icon)
+                .setExtras(extras)
                 .setDisabledMessage(mContext.getString(R.string.dynamic_shortcut_disabled_message));
 
         setLabel(builder, label);
@@ -305,6 +306,9 @@
 
     public ShortcutInfo getQuickContactShortcutInfo(long id, String lookupKey, String displayName) {
         final ShortcutInfo.Builder builder = builderForContactShortcut(id, lookupKey, displayName);
+        if (builder == null) {
+            return null;
+        }
         addIconForContact(id, lookupKey, displayName, builder);
         return builder.build();
     }
diff --git a/src/com/android/contacts/ShortcutIntentBuilder.java b/src/com/android/contacts/ShortcutIntentBuilder.java
index e90e786..b3bd85d 100644
--- a/src/com/android/contacts/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/ShortcutIntentBuilder.java
@@ -276,6 +276,9 @@
     private void createContactShortcutIntent(Uri contactUri, String contentType, String displayName,
             String lookupKey, byte[] bitmapData) {
         Intent intent = null;
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = mContext.getResources().getString(R.string.missing_name);
+        }
         if (BuildCompat.isAtLeastO()) {
             final long contactId = ContentUris.parseId(contactUri);
             final ShortcutManager sm = (ShortcutManager)
@@ -283,12 +286,11 @@
             final DynamicShortcuts dynamicShortcuts = new DynamicShortcuts(mContext);
             final ShortcutInfo shortcutInfo = dynamicShortcuts.getQuickContactShortcutInfo(
                     contactId, lookupKey, displayName);
-            intent = sm.createShortcutResultIntent(shortcutInfo);
+            if (shortcutInfo != null) {
+                intent = sm.createShortcutResultIntent(shortcutInfo);
+            }
         }
         final Drawable drawable = getPhotoDrawable(bitmapData, displayName, lookupKey);
-        if (TextUtils.isEmpty(displayName)) {
-            displayName = mContext.getResources().getString(R.string.missing_name);
-        }
 
         final Intent shortcutIntent = ImplicitIntentsUtil.getIntentForQuickContactLauncherShortcut(
                 mContext, contactUri);
@@ -346,7 +348,9 @@
             final DynamicShortcuts dynamicShortcuts = new DynamicShortcuts(mContext);
             final ShortcutInfo shortcutInfo = dynamicShortcuts.getActionShortcutInfo(
                     id, displayName, shortcutIntent, compatAdaptiveIcon.toIcon());
-            intent = sm.createShortcutResultIntent(shortcutInfo);
+            if (shortcutInfo != null) {
+                intent = sm.createShortcutResultIntent(shortcutInfo);
+            }
         }
 
         intent = intent == null ? new Intent() : intent;
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index b442e4f..9938695 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -622,9 +622,10 @@
             final AccountWithDataSet accountWithDataSet = new AccountWithDataSet(
                     account.name, account.type, null);
             final AccountType type = mTypeProvider.getTypeForAccount(accountWithDataSet);
-
-            // Accounts with a dataSet (e.g. Google plus accounts) are not writable.
-            result.add(type.wrapAccount(mContext, accountWithDataSet));
+            if (type != null) {
+                // Accounts with a dataSet (e.g. Google plus accounts) are not writable.
+                result.add(type.wrapAccount(mContext, accountWithDataSet));
+            }
         }
         return result;
     }
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 4e308b3..b249ca6 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -35,6 +35,7 @@
 import android.content.Loader;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -105,7 +106,6 @@
 import com.android.contacts.ContactsActivity;
 import com.android.contacts.ContactsUtils;
 import com.android.contacts.DynamicShortcuts;
-import com.android.contacts.Experiments;
 import com.android.contacts.NfcHandler;
 import com.android.contacts.R;
 import com.android.contacts.ShortcutIntentBuilder;
@@ -176,7 +176,6 @@
 import com.android.contacts.widget.MultiShrinkScroller.MultiShrinkScrollerListener;
 import com.android.contacts.widget.QuickContactImageView;
 import com.android.contactsbind.HelpUtils;
-import com.android.contactsbind.experiments.Flags;
 
 import com.google.common.collect.Lists;
 
@@ -1460,6 +1459,7 @@
         Trace.beginSection("Build data items map");
 
         final Map<String, List<DataItem>> dataItemsMap = new HashMap<>();
+        final boolean tachyonEnabled = CallUtil.isTachyonEnabled(this);
 
         for (RawContact rawContact : data.getRawContacts()) {
             for (DataItem dataItem : rawContact.getDataItems()) {
@@ -1469,6 +1469,7 @@
                 if (mimeType == null) continue;
 
                 if (!MIMETYPE_TACHYON.equals(mimeType)) {
+                    // Only validate non-Tachyon mimetypes.
                     final AccountType accountType = rawContact.getAccountType(this);
                     final DataKind dataKind = AccountTypeManager.getInstance(this)
                             .getKindOrFallback(accountType, mimeType);
@@ -1480,6 +1481,9 @@
                             dataKind));
 
                     if (isMimeExcluded(mimeType) || !hasData) continue;
+                } else if (!tachyonEnabled) {
+                    // If tachyon isn't enabled, skip its mimetypes.
+                    continue;
                 }
 
                 List<DataItem> dataItemListByType = dataItemsMap.get(mimeType);
@@ -1824,7 +1828,7 @@
                     thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
                     thirdContentDescription =
                             res.getString(R.string.description_video_call);
-                } else if (Flags.getInstance().getBoolean(Experiments.QUICK_CONTACT_VIDEO_CALL)
+                } else if (CallUtil.isTachyonEnabled(context)
                         && ((PhoneDataItem) dataItem).isTachyonReachable()) {
                     thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
                     thirdAction = Entry.ACTION_INTENT;
@@ -1919,8 +1923,8 @@
                     aboutCardName.value = res.getString(R.string.about_card_title);
                 }
             }
-        } else if (Flags.getInstance().getBoolean(Experiments.QUICK_CONTACT_VIDEO_CALL)
-                && MIMETYPE_TACHYON.equals(dataItem.getMimeType())) {
+        } else if (CallUtil.isTachyonEnabled(context) && MIMETYPE_TACHYON.equals(
+                dataItem.getMimeType())) {
             // Skip these actions. They will be placed by the phone number.
             return null;
         } else {
@@ -2698,21 +2702,26 @@
      * Creates a launcher shortcut with the current contact.
      */
     private void createLauncherShortcutWithContact() {
-        final ShortcutIntentBuilder builder = new ShortcutIntentBuilder(this,
-                new OnShortcutIntentCreatedListener() {
+        if (BuildCompat.isAtLeastO()) {
+            final ShortcutManager shortcutManager = (ShortcutManager)
+                    getSystemService(SHORTCUT_SERVICE);
+            final DynamicShortcuts shortcuts =
+                    new DynamicShortcuts(QuickContactActivity.this);
+            String displayName = mContactData.getDisplayName();
+            if (displayName == null) {
+                displayName = getString(R.string.missing_name);
+            }
+            final ShortcutInfo shortcutInfo = shortcuts.getQuickContactShortcutInfo(
+                    mContactData.getId(), mContactData.getLookupKey(), displayName);
+            if (shortcutInfo != null) {
+                shortcutManager.requestPinShortcut(shortcutInfo, null);
+            }
+        } else {
+            final ShortcutIntentBuilder builder = new ShortcutIntentBuilder(this,
+                    new OnShortcutIntentCreatedListener() {
 
-                    @Override
-                    public void onShortcutIntentCreated(Uri uri, Intent shortcutIntent) {
-                        if (BuildCompat.isAtLeastO()) {
-                            final ShortcutManager shortcutManager = (ShortcutManager)
-                                    getSystemService(SHORTCUT_SERVICE);
-                            final DynamicShortcuts shortcuts =
-                                    new DynamicShortcuts(QuickContactActivity.this);
-                            shortcutManager.requestPinShortcut(
-                                    shortcuts.getQuickContactShortcutInfo(
-                                            mContactData.getId(), mContactData.getLookupKey(),
-                                            mContactData.getDisplayName()), null);
-                        } else {
+                        @Override
+                        public void onShortcutIntentCreated(Uri uri, Intent shortcutIntent) {
                             // Broadcast the shortcutIntent to the launcher to create a
                             // shortcut to this contact
                             shortcutIntent.setAction(ACTION_INSTALL_SHORTCUT);
@@ -2728,9 +2737,9 @@
                             Toast.makeText(QuickContactActivity.this, toastMessage,
                                     Toast.LENGTH_SHORT).show();
                         }
-                    }
-                });
-        builder.createContactShortcutIntent(mContactData.getLookupUri());
+                    });
+            builder.createContactShortcutIntent(mContactData.getLookupUri());
+        }
     }
 
     private boolean isShortcutCreatable() {