diff --git a/res/drawable-hdpi/ic_status_blocked_orange_40dp.png b/res/drawable-hdpi/ic_status_blocked_orange_40dp.png
new file mode 100644
index 0000000..1b2f272
--- /dev/null
+++ b/res/drawable-hdpi/ic_status_blocked_orange_40dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_status_blocked_orange_40dp.png b/res/drawable-mdpi/ic_status_blocked_orange_40dp.png
new file mode 100644
index 0000000..21fd3ec
--- /dev/null
+++ b/res/drawable-mdpi/ic_status_blocked_orange_40dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_status_blocked_orange_40dp.png b/res/drawable-xhdpi/ic_status_blocked_orange_40dp.png
new file mode 100644
index 0000000..d6a746a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_status_blocked_orange_40dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_status_blocked_orange_40dp.png b/res/drawable-xxhdpi/ic_status_blocked_orange_40dp.png
new file mode 100644
index 0000000..301a7a7
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_status_blocked_orange_40dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_status_blocked_orange_40dp.png b/res/drawable-xxxhdpi/ic_status_blocked_orange_40dp.png
new file mode 100644
index 0000000..aa73d38
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_status_blocked_orange_40dp.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b86e6b3..d4fb1c3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> eerder as <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou verstekbellerprogram?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou verstekbellerprogram?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Geblokkeerde nommers"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Oproepe en SMS\'e vanaf nommers op hierdie lys word geblokkeer."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Jy sal nie oproepe of boodskappe vanaf geblokkerde nommers ontvang nie."</string>
     <string name="block_number" msgid="1101252256321306179">"Voeg \'n nommer by"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Deblokkeer <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Deblokkeer"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokkeer oproepe en SMS\'e vanaf"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nommer of e-posadres"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Foonnommer"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokkeer"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Net die toesteleienaar kan geblokkeerde nommers bekyk en bestuur."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Oortjie om te deblokkeer"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokkering is tydelik af"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Nadat jy \'n noodnommer gebel het of \'n boodskap daarheen gestuur het, sal blokkering afgeskakel word sodat nooddienste jou kan kontak."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Heraktiveer nou"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Gebruik tans die persoonlike beller om die oproep te maak"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5ef7e9e..80483e3 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g>ን በ<xliff:g id="CURRENT_APP">%2$s</xliff:g> ምትክ እንደ የእርስዎ ነባሪ መደወያ መተግበሪያ ይጠቀም?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g>ን እንደ የእርስዎ ነባሪ መደወያ መተግበሪያ ይጠቀም?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"የታገዱ ቁጥሮች"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"በዚህ ዝርዝር ላይ ካሉ ቁጥሮች የሚመጡ ጥሪዎች እና ጽሑፎች ታግደዋል።"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ከታገዱ ቁጥሮች ጥሪዎች ወይም ጽሑፎች አይቀበሉም።"</string>
     <string name="block_number" msgid="1101252256321306179">"ቁጥር ያክሉ"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"የ<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> እገዳ ይነሳ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"እገዳውን አንሳ"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ከሚከተለው የሚመጡ ጥሪዎችን እና ጽሑፎችን አግድ፦"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"ቁጥር ወይም ኢሜይል"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"የስልክ ቁጥር"</string>
     <string name="block_button" msgid="8822290682524373357">"አግድ"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"የመሣሪያው ባለቤት ብቻ ነው የታገዱ ቁጥሮችን ማየት እና ማስተዳደር የሚችለው።"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"እንዳይታገድ ለማድረግ መታ ያድርጉ"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ማገድ ለጊዜው ጠፍቷል"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"የድንገተኛ አደጋ ቁጥር ከደወሉ ወይ ከጻፉ በኋላ፣ የድንገተኛ አደጋ አገልግሎቶች እርስዎን መገናኘት እንዲሚችል ለማረጋገጥ ማገጃ ጠፍቷል።"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"አሁን እንደገና-ያንቁ"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ጥሪውን ለማድረግ የግል መደወያውን መጠቀም"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5ea4355..0322f05 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"هل تريد استخدام <xliff:g id="NEW_APP">%1$s</xliff:g> بدلاً من <xliff:g id="CURRENT_APP">%2$s</xliff:g> تطبيقًا افتراضيًا لبرنامج الاتصال؟"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> تطبيقًا افتراضيًا لبرنامج الاتصال؟"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"الأرقام المحظورة"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"تم حظر المكالمات والرسائل النصية من الأرقام على هذه القائمة."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"لن تتلقى المكالمات أو المراسلات النصية من الأرقام المحظورة."</string>
     <string name="block_number" msgid="1101252256321306179">"إضافة رقم"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"هل تريد إلغاء حظر <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>؟"</string>
     <string name="unblock_button" msgid="3078048901972674170">"إلغاء الحظر"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"حظر المكالمات والرسائل النصية من"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"الرقم أو البريد الإلكتروني"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"رقم الهاتف"</string>
     <string name="block_button" msgid="8822290682524373357">"حظر"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"يمكن لمالك الجهاز فقط الاطلاع على الأرقام المحظورة وإدارتها."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"انقر لإلغاء الحظر"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"تم إيقاف الحظر مؤقتًا"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"بعد الاتصال الهاتفي أو إرسال رسالة نصية إلى رقم طوارئ، يتم إيقاف تشغيل الحظر لضمان تمكن خدمات الطوارئ من الاتصال بك."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"إعادة تمكين الآن"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"يتم استخدام أداة الاتصال الشخصي لإجراء الاتصال"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 708ca5c..70f9dc0 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Defolt nömrə yığan tətbiqi kimi <xliff:g id="CURRENT_APP">%2$s</xliff:g> əvəzinə <xliff:g id="NEW_APP">%1$s</xliff:g> işlədilsin?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Defolt nömrə yığan tətbiqi kimi <xliff:g id="NEW_APP">%s</xliff:g> işlədilsin?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Bloklanmış nömrələr"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Bu siyahıdakı nömrələrdən gələn zənglər və mətnlər blok edilib."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Blok edilmiş nömrədən zənglər və ya mesajlar almayacaqsınız."</string>
     <string name="block_number" msgid="1101252256321306179">"Nömrə əlavə edin"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> nömrəsi blokdan çıxarılsın?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Blokdan çıxar"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Zəngləri və mətnləri buradan blok edin"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nömrə və ya e-poçt"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefon nömrəsi"</string>
     <string name="block_button" msgid="8822290682524373357">"Blok edin"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Yalnız cihaz sahibi blok edilmiş nömrələrə baxa və idarə edə bilər."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Kiliddən çıxarmaq üçün basın"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Bloklama müvəqqəti olaraq deaktiv edildi"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Fövqəladə nömrəyə zəng etdikdən və ya mesaj yazdıqdan sonra, fövqəladə xidmətlərin sizinlə əlaqə yarada biləcəyinə əmin olmaq üçün bloklama deaktiv edildi."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"İndi yenidən aktiv edin"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Zəng etmək üçün şəxsi nömrə yığımı istifadə olunur"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 77793b0..d4d9977 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Želite li da koristite aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao podrazumevanu aplikaciju za pozivanje telefonskih brojeva?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Želite li da koristite aplikaciju <xliff:g id="NEW_APP">%s</xliff:g> kao podrazumevanu aplikaciju za pozivanje telefonskih brojeva?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokirani brojevi"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Pozivi i SMS-ovi sa brojeva na ovoj listi su blokirani."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Nećete primati pozive ni SMS-ove sa blokiranih brojeva."</string>
     <string name="block_number" msgid="1101252256321306179">"Dodaj broj"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Želite li da deblokirate <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Deblokiraj"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokirajte pozive i SMS-ove od"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Broj ili imejl"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Broj telefona"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokiraj"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Samo vlasnik uređaja može da pregleda blokirane brojeve i upravlja njima."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Dodirnite da biste deblokirali"</string>
-    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Korišćenje ličnog brojčanika za upućivanje poziva"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokiranje je privremeno isključeno"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Kad pozovete broj hitne službe ili na taj broj pošaljete SMS, blokiranje se isključuje da bi hitne službe mogle da vas kontaktiraju."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Ponovo omogući"</string>
+    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Korišćenje brojčanika iz ličnog profila za upućivanje poziva"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ff59be9..c39c0d7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g> да се използва ли вместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> като основното ви приложение за дайлер?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Да се използва ли <xliff:g id="NEW_APP">%s</xliff:g> като основното ви приложение за дайлер?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Блокирани номера"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Обажданията и текстовите съобщения от номерата в този списък са блокирани."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Няма да получавате обаждания или SMS от блокираните номера."</string>
     <string name="block_number" msgid="1101252256321306179">"Добавяне на номер"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Искате ли да отблокирате <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Отблокиране"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Блокиране на обажданията и текстовите съобщения от"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Номер или имейл адрес"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Телефонен номер"</string>
     <string name="block_button" msgid="8822290682524373357">"Блокиране"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Само собственикът на устройството може да преглежда и управлява блокираните номера."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Раздел за отблокиране"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Блокирането временно е изключено"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"След като наберете или изпратите SMS до номер за спешни повиквания, блокирането се изключва, за да могат спешните служби да се свържат с вас."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Повторно активиране сега"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"За извършване на обаждането се използва личната клавиатура за набиране"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index a4038dd..8fee4e9 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"আপনার ডিফল্ট ডায়লার অ্যাপ হিসেবে <xliff:g id="CURRENT_APP">%2$s</xliff:g> পরিবর্তে <xliff:g id="NEW_APP">%1$s</xliff:g> ব্যবহার করবেন?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"আপনার ডিফল্ট ডায়লার অ্যাপ হিসেবে <xliff:g id="NEW_APP">%s</xliff:g> ব্যবহার করবেন?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"অবরুদ্ধ নম্বরগুলি"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"এই তালিকার নম্বরগুলি থেকে আসা কল এবং পাঠ্যগুলিকে অবরুদ্ধ করা হয়েছে৷"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"অবরুদ্ধ নম্বরগুলি থেকে আপনি কল বা পাঠ্য বার্তাগুলি পাবেন না।"</string>
     <string name="block_number" msgid="1101252256321306179">"একটি নম্বর যোগ করুন"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> অবরোধ মুক্ত করবেন?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"অবরোধ মুক্ত করুন"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"এর থেকে কল এবং পাঠ্যগুলিকে অবরোধ করুন"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"নম্বর বা ইমেল"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ফোন নম্বর"</string>
     <string name="block_button" msgid="8822290682524373357">"অবরোধ করুন"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"শুধুমাত্র ডিভাইসের মালিক এই অবরুদ্ধ নম্বরগুলিকে দেখতে এবং পরিচালনা করতে পারেন৷"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"অবরোধ মুক্ত করতে আলতো চাপ দিন"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"অবরুদ্ধ করা সাময়িকভাবে বন্ধ আছে"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"আপনি কোনো জরুরি নম্বরে ডায়াল করার বা পাঠ্য পাঠানোর পরে, জরুরি পরিষেবাগুলি যাতে আপনাকে কল করতে পারে সেই বিষয়টি নিশ্চিত করতে অবরুদ্ধ করার ব্যবস্থাটিকে বন্ধ করা হয়৷"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"এখনই পুনরায় সক্ষম করুন"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"কল করার জন্য ব্যক্তিগত ডায়ালার ব্যবহার করা হচ্ছে"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 912b0c0..7af851d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació de marcador predeterminada?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> com a aplicació de marcador predeterminada?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Números bloquejats"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Les trucades i els missatges de text dels números que hi ha en aquesta llista estan bloquejats."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"No rebràs trucades ni missatges de text dels números bloquejats."</string>
     <string name="block_number" msgid="1101252256321306179">"Afegeix un número"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Vols desbloquejar el número <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desbloqueja"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloqueja les trucades i els missatges de text de"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Número o adreça electrònica"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Número de telèfon"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloqueja"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Només el propietari del dispositiu pot consultar i gestionar els números bloquejats."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Toca per desbloquejar-lo"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"El bloqueig està desactivat temporalment"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Quan marques un número d\'emergència o hi envies un missatge de text, el bloqueig es desactiva per garantir que els serveis d\'emergència puguin contactar amb tu."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Torna a activar ara"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"S\'està utilitzant el telèfon personal per fer la trucada"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2c9ff6c..e8be3ae 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Chcete aplikaci <xliff:g id="NEW_APP">%1$s</xliff:g> použít jako výchozí aplikaci vytáčení místo aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Chcete aplikaci <xliff:g id="NEW_APP">%s</xliff:g> použít jako výchozí aplikaci vytáčení?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokovaná čísla"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Volání a zprávy SMS z čísel v tomto seznamu budou blokovány."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Ze zablokovaných čísel už nebudete přijímat hovory ani zprávy SMS."</string>
     <string name="block_number" msgid="1101252256321306179">"Přidat číslo"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Odblokovat číslo <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Odblokovat"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokovat hovory a zprávy SMS od odesílatele"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Číslo nebo e-mail"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonní číslo"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokovat"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Prohlížet a spravovat blokovaná čísla může pouze vlastník zařízení."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Klepnutím číslo odblokujete"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokování je dočasně vypnuto"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Když vytočíte nebo pošlete zprávu na číslo tísňové linky, blokování je vypnuto, aby vás pohotovostní služby mohly kontaktovat."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Znovu zapnout"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Volání se provádí pomocí osobního vytáčení"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c978fd1..03b2530 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Brug <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> som din standardapp til opkald?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Brug <xliff:g id="NEW_APP">%s</xliff:g> som din standardapp til opkald?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokerede telefonnumre"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Opkald og sms-beskeder fra numre på denne liste er blokeret."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Du modtager ikke opkald eller sms-beskeder fra blokerede numre."</string>
     <string name="block_number" msgid="1101252256321306179">"Tilføj et nummer"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Vil du ophæve blokeringen af <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Ophæv blokeringen"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloker opkald og sms-beskeder fra"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Telefonummer eller e-mailadresse"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonnummer"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloker"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Det er kun ejeren af en enhed, der kan se og administrere blokerede numre."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tryk for at ophæve blokeringen"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokering er midlertidigt slået fra"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Når du har ringet eller sendt en sms-besked til alarmcentralen, bliver blokering slået fra for at sikre, at alarmcentralen kan komme i kontakt med dig."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Genaktiver nu"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Opkaldet foretages med det personlige opkaldsprogram"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1135652..825fdbb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g> statt <xliff:g id="CURRENT_APP">%2$s</xliff:g> als Standard-App für Telefonie verwenden?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> als Standard-App für Telefonie verwenden?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blockierte Nummern"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Anrufe und SMS von Nummern in dieser Liste werden blockiert."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Du erhältst keine Anrufe oder SMS von blockierten Nummern."</string>
     <string name="block_number" msgid="1101252256321306179">"Nummer hinzufügen"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Blockierung von <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> aufheben?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Blockierung aufheben"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Anrufe und SMS blockieren von"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Telefonnummer oder E-Mail-Adresse"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonnummer"</string>
     <string name="block_button" msgid="8822290682524373357">"Blockieren"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Nur der Geräteeigentümer kann blockierte Nummern sehen und verwalten."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Zum Aufheben der Blockierung tippen"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blockierung vorübergehend aus"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Nachdem du eine Notrufnummer gewählt oder per SMS gesendet hast, wird die Blockierung aufgehoben, damit dich die Notfalldienste erreichen können."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Jetzt neu aktivieren"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Zum Anrufen wird das eigene Telefon genutzt"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6322d1a..bc4bd91 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Χρήση της εφαρμογής <xliff:g id="NEW_APP">%1$s</xliff:g> αντί για την εφαρμογή <xliff:g id="CURRENT_APP">%2$s</xliff:g> ως προεπιλεγμένης εφαρμογής Dialer;"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Χρήση της εφαρμογής <xliff:g id="NEW_APP">%s</xliff:g> ως προεπιλεγμένης εφαρμογής Dialer;"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Αποκλεισμένοι αριθμοί"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Έχουν αποκλειστεί οι κλήσεις και τα μηνύματα που προέρχονται από τους αριθμούς που περιλαμβάνονται σε αυτήν τη λίστα."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Δεν θα λαμβάνετε κλήσεις ή μηνύματα κειμένου από αποκλεισμένους αριθμούς."</string>
     <string name="block_number" msgid="1101252256321306179">"Προσθήκη αριθμού"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Να καταργηθεί ο αποκλεισμός του αριθμού <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>;"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Κατάργηση αποκλεισμού"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Αποκλεισμός κλήσεων και μηνυμάτων από"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Αριθμός ή διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Αριθμός τηλεφώνου"</string>
     <string name="block_button" msgid="8822290682524373357">"Αποκλεισμός"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Μόνο ο κάτοχος της συσκευής μπορεί να προβάλλει και να διαχειρίζεται αποκλεισμένους αριθμούς."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Πατήστε για να καταργήσετε τον αποκλεισμό"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Αποκλεισμός προσωρινά απενεργοποιημένος"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Αφού καλέσετε ή στείλετε μήνυμα κειμένου προς έναν αριθμό έκτακτης ανάγκης, ο αποκλεισμός απενεργοποιείται, προκειμένου να διασφαλιστεί ότι είναι δυνατή η επικοινωνία μαζί σας από τις υπηρεσίες έκτακτης ανάγκης."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Επανενεργοποίηση τώρα"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Χρήση του προσωπικού σας προγράμματος κλήσης για την πραγματοποίηση της κλήσης"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0c51caf..32324ca 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your default dialler app?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your default dialler app?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blocked numbers"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Calls and texts from numbers on this list are blocked."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"You won\'t receive calls or texts from blocked numbers."</string>
     <string name="block_number" msgid="1101252256321306179">"Add a number"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Unblock <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Unblock"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Block calls and texts from"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Number or email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telephone number"</string>
     <string name="block_button" msgid="8822290682524373357">"Block"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Only the device owner can view and manage blocked numbers."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab to unblock"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blocking temporarily off"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"When you dial or text an emergency number, blocking is turned off to ensure that emergency services can contact you."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Re-enable now"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Using the personal dialler to make the call"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0c51caf..32324ca 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your default dialler app?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your default dialler app?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blocked numbers"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Calls and texts from numbers on this list are blocked."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"You won\'t receive calls or texts from blocked numbers."</string>
     <string name="block_number" msgid="1101252256321306179">"Add a number"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Unblock <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Unblock"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Block calls and texts from"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Number or email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telephone number"</string>
     <string name="block_button" msgid="8822290682524373357">"Block"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Only the device owner can view and manage blocked numbers."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab to unblock"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blocking temporarily off"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"When you dial or text an emergency number, blocking is turned off to ensure that emergency services can contact you."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Re-enable now"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Using the personal dialler to make the call"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0c51caf..32324ca 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your default dialler app?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your default dialler app?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blocked numbers"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Calls and texts from numbers on this list are blocked."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"You won\'t receive calls or texts from blocked numbers."</string>
     <string name="block_number" msgid="1101252256321306179">"Add a number"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Unblock <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Unblock"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Block calls and texts from"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Number or email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telephone number"</string>
     <string name="block_button" msgid="8822290682524373357">"Block"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Only the device owner can view and manage blocked numbers."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab to unblock"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blocking temporarily off"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"When you dial or text an emergency number, blocking is turned off to ensure that emergency services can contact you."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Re-enable now"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Using the personal dialler to make the call"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 77986d6..4d99c02 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"¿Quieres usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como la aplicación de marcado predeterminada?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"¿Quieres usar <xliff:g id="NEW_APP">%s</xliff:g> como la aplicación de marcado predeterminada?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Números bloqueados"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Las llamadas y los mensajes de texto de los números en esta lista están bloqueados."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"No recibirás llamadas ni mensajes de texto de los números bloqueados."</string>
     <string name="block_number" msgid="1101252256321306179">"Agregar un número"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"¿Quieres desbloquear <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desbloquear"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquear llamadas y mensajes de texto de"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Número o correo electrónico"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Número de teléfono"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquear"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Solo el propietario del dispositivo puede ver y administrar los números bloqueados."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Presionar para desbloquear"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"El bloqueo se desactivó de forma temporal"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Luego de que llamas o envías un mensaje a un número de emergencia, el bloqueo se desactiva para garantizar que los servicios de emergencia puedan ponerse en contacto contigo."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Volver a habilitar ahora"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Usando el teléfono personal para realizar la llamada"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c8a66a8..2caf70f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"¿Quieres utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como marcador predeterminado?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"¿Quieres utilizar <xliff:g id="NEW_APP">%s</xliff:g> como marcador predeterminado?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Números bloqueados"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Las llamadas y los mensajes de texto de los números de esta lista están bloqueados."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"No recibirás llamadas ni SMS de los números bloqueados."</string>
     <string name="block_number" msgid="1101252256321306179">"Añadir un número"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"¿Desbloquear el número <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desbloquear"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquear llamadas y mensajes de texto del número"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Número o correo electrónico"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Número de teléfono"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquear"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Solo el propietario del dispositivo puede ver y administrar los números bloqueados."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Toca para desbloquear"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Bloqueo desactivado temporalmente"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Después de llamar o enviar un SMS a un número de emergencias, el bloqueo se desactiva para que los servicios de emergencias puedan contactarte."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Volver a habilitarlo ahora"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Utilizando teléfono personal para llamar"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 46d5af1..058bcba 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Kas kasutada rakendust <xliff:g id="NEW_APP">%1$s</xliff:g> rakenduse <xliff:g id="CURRENT_APP">%2$s</xliff:g> asemel helistamise vaikerakendusena?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Kas kasutada rakendust <xliff:g id="NEW_APP">%s</xliff:g> helistamise vaikerakendusena?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokeeritud numbrid"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Kõned ja tekstsõnumid selles loendis olevatelt numbritelt on blokeeritud."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Te ei saa blokeeritud numbritelt kõnesid ega tekstsõnumeid."</string>
     <string name="block_number" msgid="1101252256321306179">"Lisa number"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Kas deblokeerida number <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Deblokeeri"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokeeri kõned ja tekstsõnumid numbrilt"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Number või e-posti aadress"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefoninumber"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokeeri"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Ainult seadme omanik saab blokeeritud numbreid vaadata ja hallata."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Puudutage deblokeerimiseks"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokeerimine on ajutiselt välja lülitatud"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Kui helistate või saadate sõnumi hädaabinumbrile, lülitatakse blokeerimine välja, et hädaabiteenused saaksid teiega ühendust võtta."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Luba kohe uuesti"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Helistamiseks kasutatakse isiklikku helistamisprogrammi"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 616ed1d..8869671 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> aplikazioaren ordez <xliff:g id="NEW_APP">%1$s</xliff:g> erabili nahi duzu telefono-aplikazio lehenetsi gisa?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> telefono-aplikazio lehenetsi gisa erabili nahi duzu?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokeatutako zenbakiak"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Blokeatuta daude zerrenda honetako zenbakietatik jasotzen diren deiak eta testu-mezuak."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Ez duzu deirik edo testu-mezurik jasoko blokeatutako zenbakietatik."</string>
     <string name="block_number" msgid="1101252256321306179">"Gehitu zenbakia"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Desblokeatu egin nahi duzu <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desblokeatu"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokeatu zenbaki honetatik jasotzen diren deiak eta testu-mezuak:"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Zenbakia edo helbide elektronikoa"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefono-zenbakia"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokeatu"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Gailuaren jabeak soilik ikus eta kudea ditzake blokeatutako zenbakiak."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Sakatu desblokeatzeko"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Aldi baterako desgaitu da blokeatzeko aukera"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Larrialdietarako zenbakia markatu ondoren, edo zenbait horretara testu-mezua bidali ondoren, desaktibatu egingo da blokeatzeko aukera, larrialdietako zerbitzuak zurekin harremanetan jarriko direla ziurtatzeko."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Gaitu berriro"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Telefono pertsonala erabiltzen ari zara deia egiteko"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2eb1903..6b6b9f5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"از <xliff:g id="NEW_APP">%1$s</xliff:g> به جای <xliff:g id="CURRENT_APP">%2$s</xliff:g> به عنوان برنامه شماره‌گیر پیش‌فرض استفاده شود؟"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"از <xliff:g id="NEW_APP">%s</xliff:g> به عنوان برنامه شماره‌گیر پیش‌فرض استفاده شود؟"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"شماره‌های مسدود‌شده"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"تماس‌ها و پیامک‌های دریافتی از شماره‌های این فهرست مسدود شده‌اند."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"نمی‌توانید از شماره‌های مسدود شده تماس یا پیام نوشتاری دریافت کنید."</string>
     <string name="block_number" msgid="1101252256321306179">"افزودن شماره"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> گشوده شود؟"</string>
     <string name="unblock_button" msgid="3078048901972674170">"گشودن"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"مسدود کردن تماس و پیامک از"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"شماره تلفن یا رایانامه"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"شماره تلفن"</string>
     <string name="block_button" msgid="8822290682524373357">"مسدود کردن"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"فقط مالک دستگاه می‌تواند شماره‌های مسدودشده را مدیریت کند."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"ضربه برای گشودن"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"امکان مسدود کردن موقتاً خاموش شده است."</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"بعد از گرفتن شماره اضطراری یا ارسال پیام نوشتاری به آن شماره، برای اطمینان از اینکه سرویس‌های اضطراری با شما تماس بگیرند، امکان مسدود کردن خاموش شده است."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"اکنون دوباره فعال شود"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"استفاده از شماره‌گیر شخصی برای گرفتن تماس"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1f7e161..7c10abf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Asetetaanko oletuspuhelusovellukseksi <xliff:g id="NEW_APP">%1$s</xliff:g> sovelluksen <xliff:g id="CURRENT_APP">%2$s</xliff:g> sijaan?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Asetetaanko <xliff:g id="NEW_APP">%s</xliff:g> oletuspuhelusovellukseksi?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Estetyt numerot"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Tämän luettelon numeroista saapuvat puhelut ja tekstiviestit estetään."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Et voi vastaanottaa puheluita tai tekstiviestejä estetyistä numeroista."</string>
     <string name="block_number" msgid="1101252256321306179">"Lisää numero"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Kumotaanko numeron <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> esto?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Kumoa esto"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Estä puhelut ja tekstiviestit numerosta"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numero tai sähköpostiosoite"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Puhelinnumero"</string>
     <string name="block_button" msgid="8822290682524373357">"Estä"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Vain laitteen omistaja voi katsella ja hallinnoida estettyjä numeroita."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Kumoa esto koskettamalla."</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Esto on väliaikaisesti pois käytöstä"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Hätänumeroon soittamisen tai tekstiviestin lähettämisen jälkeen esto poistetaan käytöstä, jotta hätäviranomaiset voivat olla yhteydessä sinuun."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Ota nyt uudelleen käyttöön"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Puhelun soittaminen henkilökohtaisella numerovalitsimella"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 30b83e6..5760ef2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application de composition par défaut?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application de composition par défaut?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Numéros bloqués"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Les appels et les textos provenant des numéros dans cette liste seront bloqués."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Vous ne recevrez pas d\'appels ni de messages texte provenant des numéros bloqués."</string>
     <string name="block_number" msgid="1101252256321306179">"Ajouter un numéro"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Débloquer <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Débloquer"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquer les appels et lers textos de"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numéro ou adresse de courriel"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Numéro de téléphone"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquer"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Seul le propriétaire de l\'appareil peut afficher et gérer les numéros bloqués."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Touchez ici pour débloquer"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Le blocage est temporairement désactivé"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Lorsque vous communiquez avec les services d\'urgence par téléphone ou par message texte, la fonctionnalité de blocage est désactivée pour que ceux-ci puissent vous joindre."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Réactiver le blocage maintenant"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Utilisation du clavier personnel pour faire l\'appel…"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7de4c55..35d0eb8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> et non plus <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application de clavier par défaut ?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application de clavier par défaut ?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Numéros bloqués"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Les appels et les SMS de numéros figurant sur cette liste seront bloqués."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Vous ne recevrez plus les appels ni les SMS émis depuis les numéros bloqués."</string>
     <string name="block_number" msgid="1101252256321306179">"Ajouter un numéro"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Débloquer <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Débloquer"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquer les appels et les SMS de"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numéro ou adresse e-mail"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Numéro de téléphone"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquer"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Seul le propriétaire de l\'appareil peut afficher et gérer les numéros bloqués."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Appuyer pour débloquer"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Le blocage est temporairement désactivé."</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Si vous composez un numéro d\'urgence ou que vous envoyez un SMS à ce type de numéro, le blocage est désactivé pour que les services d\'urgence puissent vous contacter."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Réactiver"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Utilisation du clavier personnel pour passer l\'appel…"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 699cc50..9de01f5 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Queres usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a túa aplicación de marcador predeterminada?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Queres usar <xliff:g id="NEW_APP">%s</xliff:g> como a túa aplicación de marcador predeterminada?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Números bloqueados"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"As chamadas e as mensaxes dos números da lista están bloqueadas."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Non recibirás chamadas nin mensaxes de texto desde números bloqueados."</string>
     <string name="block_number" msgid="1101252256321306179">"Engadir un número"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Queres desbloquear o <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desbloquear"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquear chamadas e mensaxes do"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Número ou correo electrónico"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Número de teléfono"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquear"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Só o propietario do dispositivo pode ver e xestionar os números bloqueados."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Toca para desbloquear"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"O bloqueo desactivouse temporalmente"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Despois de marcar un número de emerxencia ou enviarlle unha mensaxe, desactívase o bloqueo para garantir que os servizos de emerxencia poidan poñerse en contacto contigo."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Volver activar agora"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Usando o marcador persoal para facer a chamada"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 3d4e684..e064292 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"તમારી ડિફોલ્ટ ડાયલર એપ્લિકેશન તરીકે <xliff:g id="CURRENT_APP">%2$s</xliff:g> ને બદલે <xliff:g id="NEW_APP">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"તમારી ડિફોલ્ટ ડાયલર એપ્લિકેશન તરીકે <xliff:g id="NEW_APP">%s</xliff:g> નો ઉપયોગ કરીએ?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"અવરોધિત નંબરો"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"આ સૂચિ પરના નંબરોના કૉલ્સ અને ટેક્સ્ટ અવરોધિત કરવામાં આવે છે."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"તમે અવરોધિત નંબરોથી કૉલ્સ અથવા ટેક્સ્ટ પ્રાપ્ત કરશો નહીં."</string>
     <string name="block_number" msgid="1101252256321306179">"એક નંબર ઉમેરો"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ને અનાવરોધિત કરીએ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"અનાવરોધિત કરો"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"આ નંબરના કૉલ્સ અને ટેક્સ્ટને અવરોધિત કરો"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"નંબર અથવા ઇમેઇલ"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ફોન નંબર"</string>
     <string name="block_button" msgid="8822290682524373357">"અવરોધિત કરો"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ફક્ત ઉપકરણના માલિક અવરોધિત નંબરોને જોઈ અને સંચાલિત કરી શકે છે."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"અનાવરોધિત કરવા માટે ટૅબ કરો"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"અવરોધિત કરવાનું અસ્થાયીરૂપે બંધ છે"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"તમે કોઈ કટોકટીનો નંબર ડાયલ કરો કે ટેક્સ્ટ કરો તે પછી, કટોકટીની સેવાઓ તમારો સંપર્ક કરી શકે તેની ખાતરી કરવા માટે અવરોધિત કરવું બંધ કરવામાં આવે છે."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"હવે ફરીથી સક્ષમ કરો"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"કૉલ કરવા માટે વ્યક્તિગત ડાયલરનો ઉપયોગ કરી રહ્યાં છે"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ee406ab..d5241d5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"अपने डिफ़ॉल्‍ट डायलर ऐप के रूप में <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"अपने डिफ़ॉल्‍ट डायलर ऐप के रूप में <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"अवरोधित नंबर"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"इस सूची के नंबर से कॉल और लेख अवरुद्ध किए गए हैं."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"आपको अवरुद्ध किए गए नंबर से कॉल या लेख संदेश प्राप्त नहीं होंगे."</string>
     <string name="block_number" msgid="1101252256321306179">"एक नंबर जोड़ें"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> को अनवरोधित करें?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"अनवरोधित करें"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"इसके कॉल और लेख को अवरुद्ध करें"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"नंबर या ईमेल"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"फ़ोन नंबर"</string>
     <string name="block_button" msgid="8822290682524373357">"अवरुद्ध करें"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"केवल डिवाइस स्वामी अवरुद्ध किए गए नंबर देख और प्रबंधित कर सकते हैं."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"अनवरोधित करने के लिए टैब करें"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"अवरोधन अस्थायी रूप से बंद है"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"आपातकालीन नंबर डायल करने या उस पर लेख संदेश भेजने के बाद, अवरोधन बंद हो जाता है ताकि आपातकालीन सेवाएं आपसे संपर्क कर सकें."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"अभी पुन: सक्षम करें"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"कॉल करने के लिए व्यक्तिगत डायलर का उपयोग करना"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a0a1399..9e9bb8e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Želite li upotrebljavati <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao zadanu aplikaciju brojčanika?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Želite li upotrebljavati <xliff:g id="NEW_APP">%s</xliff:g> kao zadanu aplikaciju brojčanika?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokirani brojevi"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Pozivi i poruke s brojeva na popisu su blokirani."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Nećete primati pozive ni poruke s blokiranih brojeva."</string>
     <string name="block_number" msgid="1101252256321306179">"Dodaj broj"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Želite li deblokirati <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Deblokiraj"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokirajte pozive i poruke koje upućuje"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Broj ili e-adresa"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonski broj"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokiraj"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Samo vlasnik uređaja može pregledavati i kontrolirati blokirane brojeve."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Dodirnite da biste deblokirali"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokiranje je privremeno isključeno"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Nakon što nazovete broj hitne službe ili pošaljete poruku na njega, blokada će se isključiti kako bi vam se hitna služba mogla javiti."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Ponovno omogući sada"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Za upućivanje poziva upotrebljava se osobni program za biranje"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 57ba604..269b135 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Legyen a(z) <xliff:g id="NEW_APP">%1$s</xliff:g> az alapértelmezett tárcsázó alkalmazás a(z) <xliff:g id="CURRENT_APP">%2$s</xliff:g> helyett?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Legyen a(z) <xliff:g id="NEW_APP">%s</xliff:g> az alapértelmezett tárcsázó alkalmazás?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Letiltott számok"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"A listán szereplő számokról érkező hívások és SMS-ek le vannak tiltva."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"A jövőben nem kap hívásokat vagy SMS-eket a letiltott számokról."</string>
     <string name="block_number" msgid="1101252256321306179">"Szám hozzáadása"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Feloldja a következő szám letiltását: <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Letiltás feloldása"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"A következő számról érkező hívások és SMS-ek letiltása:"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Szám vagy e-mail-cím"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonszám"</string>
     <string name="block_button" msgid="8822290682524373357">"Letiltás"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Csak az eszköz tulajdonosa nézheti meg és kezelheti a letiltott számokat."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Koppintson a letiltás feloldásához"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"A tiltás átmenetileg felfüggesztve"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Ha tárcsáz egy segélyhívószámot, vagy SMS-t küld segélyhívószámra, a rendszer feloldja a tiltást, hogy a sürgősségi szolgáltatások felvehessék Önnel a kapcsolatot."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Újbóli engedélyezés most"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Hívás indítása a személyes tárcsázóval"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 22e68f5..58afdbd 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g> հավելվածը <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն որպես համարհավաքի կանխադրված հավելված:"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Դարձնե՞լ <xliff:g id="NEW_APP">%s</xliff:g> հավելվածը համարհավաքի կանխադրված հավելված:"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Արգելափակված համարներ"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Այս ցանկում պարունակվող համարներից զանգերը և տեքստային հաղորդագրությունները արգելափակված են:"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Արգելափակված համարներից զանգեր կամ տեքստային հաղորդագրություններ դուք չեք ստանա:"</string>
     <string name="block_number" msgid="1101252256321306179">"Ավելացնել համար"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Արգելաբացե՞լ <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> համարը:"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Արգելաբացել"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Արգելափակել այս համարից ստացվող զանգերն ու տեքստային հաղորդագրությունները"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Համարը կամ էլ. փոստի հասցեն"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Հեռախոսահամարը"</string>
     <string name="block_button" msgid="8822290682524373357">"Արգելափակել"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Միայն սարքի սեփականատերը կարող է դիտել և կառավարել արգելափակված համարները:"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Հպեք՝ արգելաբացելու համար"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Արգելափակումը ժամանակավորապես անջատվել է"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Արտակարգ իրավիճակի հեռախոսահամար հավաքելուց հետո հեռախոսի արգելափակումը կանջատվի, որպեսզի արտակարգ իրավիճակների ծառայությունները կարողանան կապվել ձեզ հետ:"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Նորից միացնել"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Զանգելու նպատակով անհատական համարհավաքիչի օգտագործում"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index df8768c..9b68121 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g>, bukan <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai aplikasi pemanggil default?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai aplikasi pemanggil default?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Nomor yang diblokir"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Panggilan telepon dan SMS dari nomor di daftar ini diblokir."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Anda tidak akan menerima panggilan atau SMS dari nomor yang diblokir."</string>
     <string name="block_number" msgid="1101252256321306179">"Tambahkan nomor"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Batalkan pemblokiran <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Batalkan pemblokiran"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokir panggilan telepon dan SMS dari"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nomor atau email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Nomor telepon"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokir"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Hanya pemilik perangkat yang dapat melihat dan mengelola nomor yang diblokir."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab untuk membatalkan pemblokiran"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Pemblokiran dinonaktifkan sementara"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Setelah Anda memanggil atau mengirimkan SMS ke nomor darurat, pemblokiran akan dinonaktifkan untuk memastikan bahwa layanan darurat tersebut dapat menghubungi Anda."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Aktifkan lagi sekarang"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Menggunakan telepon pribadi untuk melakukan panggilan"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 4da6a04..0f0ed5b 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Nota <xliff:g id="NEW_APP">%1$s</xliff:g> í stað <xliff:g id="CURRENT_APP">%2$s</xliff:g> sem sjálfgefið hringiforrit?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Nota <xliff:g id="NEW_APP">%s</xliff:g> sem sjálfgefið hringiforrit?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Númer á bannlista"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Lokað er fyrir símtöl og textaskilaboð úr númerum á þessum lista."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Þú færð ekki símtöl eða skilaboð frá númerum á bannlista."</string>
     <string name="block_number" msgid="1101252256321306179">"Bæta við númeri"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Taka <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> af bannlista?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Taka af bannlista"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Loka fyrir símtöl og skilaboð frá"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Númer eða netfang"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Símanúmer"</string>
     <string name="block_button" msgid="8822290682524373357">"Setja á bannlista"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Aðeins eigandi tækisins getur skoðað og stjórnað númerum á bannlista."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Flipi til að taka númer af bannlista"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Slökkt tímabundið á lokun símtala"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Eftir að þú hefur hringt eða sent skilaboð í neyðarnúmer verður slökkt á lokun símtala til að tryggja að neyðarþjónusta geti haft samband við þig."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Kveikja aftur núna"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Notar eigin símaforrit til að hringja"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c1e2cc3..23cf4b8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Utilizzare <xliff:g id="NEW_APP">%1$s</xliff:g> invece di <xliff:g id="CURRENT_APP">%2$s</xliff:g> come app tastiera predefinita?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> come app tastiera predefinita?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Numeri bloccati"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Le chiamate e gli SMS dai numeri in questo elenco vengono bloccati."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Non riceverai chiamate o SMS da numeri bloccati."</string>
     <string name="block_number" msgid="1101252256321306179">"Aggiungi un numero"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Sbloccare <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Sblocca"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blocca chiamate e SMS da"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numero o indirizzo email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Numero di telefono"</string>
     <string name="block_button" msgid="8822290682524373357">"Blocca"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Soltanto il proprietario del dispositivo può visualizzare e gestire i numeri bloccati."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tocca per sbloccare"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blocco temporaneamente disattivato"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Dopo aver chiamato o inviato un SMS a un numero di emergenza, il blocco viene disattivato per garantire che i servizi di emergenza possano contattarti."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Riattiva ora"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Utilizzo dell\'app Telefono personale per chiamare"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f9a42d4..a1aef95 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"האם להשתמש ב-<xliff:g id="NEW_APP">%1$s</xliff:g> במקום ב-<xliff:g id="CURRENT_APP">%2$s</xliff:g> כאפליקציית החייגן שבברירת מחדל?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"האם להשתמש ב-<xliff:g id="NEW_APP">%s</xliff:g> כאפליקציית החייגן שבברירת מחדל?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"מספרים חסומים"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"שיחות והודעות טקסט ממספרים ברשימה זו חסומות."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"לא תקבל שיחות או הודעות טקסט מהמספרים החסומים."</string>
     <string name="block_number" msgid="1101252256321306179">"הוסף מספר"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"האם לבטל את חסימת המספר <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"בטל חסימה"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"חסום שיחות והודעות טקסט מ-"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"מספר טלפון או אימייל"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"מספר טלפון"</string>
     <string name="block_button" msgid="8822290682524373357">"חסום"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"רק בעל המכשיר יכול להציג ולנהל מספרים חסומים."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"הקש כדי לבטל את החסימה"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"החסימה הושבתה זמנית"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"לאחר חיוג או שליחת הודעה למספר חירום, החסימה תושבת כדי ששירותי החירום יוכלו ליצור איתך קשר."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"הפעל מחדש כעת"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"משתמש בחייגן האישי כדי להתקשר"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a4db116..26b4f1c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g>を<xliff:g id="CURRENT_APP">%2$s</xliff:g>の代わりに既定の電話アプリとして使用しますか？"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g>を既定の電話アプリとして使用しますか？"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"ブロックした番号"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"このリストにある番号からの通話とテキスト メッセージがブロックされます。"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ブロックした電話番号から発信された通話やテキスト メッセージは着信しません。"</string>
     <string name="block_number" msgid="1101252256321306179">"番号を追加"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> のブロックを解除しますか？"</string>
     <string name="unblock_button" msgid="3078048901972674170">"ブロックを解除"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"次の発信元からの通話とテキスト メッセージをブロック"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"番号またはメールアドレス"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"電話番号"</string>
     <string name="block_button" msgid="8822290682524373357">"ブロック"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ブロックした番号を表示、管理できるのは端末の所有者のみです。"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"タップするとブロックを解除します"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ブロックが一時的に OFF になっています"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"緊急通報番号に電話をかけたり、テキスト メッセージを送信したりすると、ブロックが OFF になり、緊急通報受理機関からの通話を着信できるようになります。"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"再度有効にする"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"個人用の電話アプリで電話する"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index be1d09f..e84ff42 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"გსურთ ამკრეფის ნაგულისხმევ აპად <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ის ნაცვლად <xliff:g id="NEW_APP">%1$s</xliff:g>-ის გამოყენება?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"გსურთ, გამოიყენოთ <xliff:g id="NEW_APP">%s</xliff:g>, როგორც ამკრეფის ნაგულისხმევი აპი?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"დაბლოკილი ნომრები"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ამ სიაში შემავალი ნომრებიდან შემოსული ზარები და ტექსტური შეტყობინებები დაბლოკილია."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"დაბლოკილი ნომრებიდან ზარებსა და ტექსტურ შეტყობინებებს ვერ მიიღებთ."</string>
     <string name="block_number" msgid="1101252256321306179">"ნომრის დამატება"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"გსურთ, განბლოკოთ <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"განბლოკვა"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ზარებისა და ტექსტური შეტყობინებების დაბლოკვა ნომრიდან:"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"ტელეფონის ნომერი ან ელფოსტა"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ტელეფონის ნომერი"</string>
     <string name="block_button" msgid="8822290682524373357">"დაბლოკვა"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"დაბლოკილი ნომრების ნახვა და მართვა მხოლოდ მოწყობილობის მფლობელს შეუძლია."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"შეეხეთ განსაბლოკად"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ბლოკი დროებით გამორთულია"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"საგანგებო ნომრის აკრეფის ან მასზე ტესქტური შეტყობინების გაგზავნის შემდეგ ბლოკი გამოირთვება, რათა გადაუდებელი დახმარების სერვისებმა თქვენთან დაკავშირება შეძლოს."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ხელახლა ჩართვა ახლავე"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ზარის განსახორციელებლად გამოიყენება პირადი დამრეკი"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 377c1f5..04eab35 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> орнына <xliff:g id="NEW_APP">%1$s</xliff:g> қолданбасын әдепкі тергіш қолданба ретінде пайдалану қажет пе?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> қолданбасын әдепкі нөмір тергіш қолданба ретінде пайдалану қажет пе?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Бөгелген нөмірлер"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Осы тізімдегі нөмірлерден келген қоңыраулар мән мәтіндік хабарлар бөгеледі."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Тыйым салынған нөмірлерден қоңыраулар немесе мәтіндік хабарлар алмайсыз."</string>
     <string name="block_number" msgid="1101252256321306179">"Нөмір қосу"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> бұғаудан шығару керек пе?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Бөгеуден шығару"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Келесінің қоңыраулары мен мәтіндік хабарларын бөгеу"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Нөмір немесе электрондық пошта"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Телефон нөмірі"</string>
     <string name="block_button" msgid="8822290682524373357">"Бөгеу"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Бөгелген нөмірлерді тек құрылғы иесі көре және басқара алады."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Бөгеуден шығару қойындысы"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Тыйым салу уақытша өшірулі"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Төтенше жағдай нөмірін тергеннен немесе мәтіндік хабар жіберген соң, төтенше жағдай қызметтері сізге хабарласа алатынына көз жеткізу үшін тыйым салу өшіріледі."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Қазір қайта қосу"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Қоңырау шалу үшін жеке нөмір тергішті пайдалану"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index c7b4958..3f90fa2 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"ប្រើ <xliff:g id="NEW_APP">%1$s</xliff:g> ជំនួសឲ្យ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ជាកម្មវិធីហៅទូរស័ព្ទលំនាំដើមរបស់អ្នក?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ជាកម្មវិធីហៅទូរស័ព្ទលំនាំដើមរបស់អ្នក?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"លេខបានរារាំង"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ការហៅ និងការផ្ញើសារពីលេខនៅក្នុងបញ្ជីនេះត្រូវបានរារាំង"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"អ្នក​នឹង​មិន​ទទួល​បាន​ការ​ហៅ ឬ​សារ​ជា​អត្ថបទ​ពី​លេខ​ដែល​បាន​​ទប់ស្កាត់​​ឡើយ។"</string>
     <string name="block_number" msgid="1101252256321306179">"បន្ថែមលេខ"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"ឈប់រារាំង <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ឬ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"ឈប់រារាំង"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"រារាំងការហៅ និងការផ្ញើសារពី"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"លេខ ឬអ៊ីមែល"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"លេខទូរសព្ទ"</string>
     <string name="block_button" msgid="8822290682524373357">"រារាំង"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"មានតែម្ចាស់ឧបករណ៍តែប៉ុណ្ណោះដែលអាចមើល និងគ្រប់គ្រងបញ្ជីរារាំងបាន"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"ផ្ទាំងដែលត្រូវឈប់រារាំង"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"បាន​បិទ​ការ​ទប់ស្កាត់​​​ជា​បណ្ដោះអាសន្ន"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"បន្ទាប់​ពី​អ្នក​ចុច​ហៅ ឬ​ផ្ញើ​សារ​លេខ​​អាសន្ន ការ​ទប់ស្កាត់​​ត្រូវ​បាន​បិទ​​ដើម្បី​​ប្រាកដ​ថា​សេវាកម្ម​អាសន្ន​អាច​ទាក់ទង​អ្នក​បាន។"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"បើក​ដំណើរការ​ឡើងវិញ​ឥឡូវនេះ"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"កំពុងប្រើកម្មវិធីហៅផ្ទាល់ខ្លួនដើម្បីធ្វើការហៅទូរស័ព្ទ"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 2bb5ca4..0a214b2 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> ಬದಲಿಗೆ <xliff:g id="NEW_APP">%1$s</xliff:g> ಅನ್ನು ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್ ಡಯಲರ್ ಅಪ್ಲಿಕೇಶನ್ ಆಗಿ ಬಳಸುವುದೇ?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> ಅನ್ನು ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್ ಡಯಲರ್ ಅಪ್ಲಿಕೇಶನ್ ಆಗಿ ಬಳಸುವುದೇ?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳು"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ಈ ಪಟ್ಟಿಯಲ್ಲಿರುವ ಸಂಖ್ಯೆಗಳಿಂದ ಬರುವ ಕರೆಗಳು ಮತ್ತು ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳಿಂದ ಕರೆಗಳು ಅಥವಾ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ನೀವು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ."</string>
     <string name="block_number" msgid="1101252256321306179">"ಸಂಖ್ಯೆಯನ್ನು ಸೇರಿಸು"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ನಿರ್ಬಂಧ ತೆಗೆಯುವುದೇ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"ನಿರ್ಬಂಧ ತೆಗೆಯಿರಿ"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ಇದರಿಂದ ಬರುವ ಕರೆಗಳು ಮತ್ತು ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"ಸಂಖ್ಯೆ ಅಥವಾ ಇಮೇಲ್"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ಫೋನ್ ಸಂಖ್ಯೆ"</string>
     <string name="block_button" msgid="8822290682524373357">"ನಿರ್ಬಂಧಿಸು"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ಸಾಧನ ಮಾಲೀಕರು ಮಾತ್ರ ನಿರ್ಬಂಧಿಸಿದ ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"ನಿರ್ಬಂಧ ತೆಗೆಯಲು ಟ್ಯಾಬ್"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ನಿರ್ಬಂಧಿಸುವಿಕೆ ತಾತ್ಕಾಲಿಕವಾಗಿ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"ನೀವು ತುರ್ತು ಸಂಖ್ಯೆಯನ್ನು ಡಯಲ್‌ ಮಾಡಿದ ಅಥವಾ ಪಠ್ಯ ಸಂದೇಶ ಕಳುಹಿಸಿದ ನಂತರ, ತುರ್ತು ಸೇವೆಗಳಲ್ಲಿ ನಿಮ್ಮನ್ನು ಸಂಪರ್ಕಿಸಬಹುದು ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು ನಿರ್ಬಂಧಿಸುವಿಕೆ ಆಫ್‌ ಮಾಡಲಾಗಿದೆ."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ಇದೀಗ ಮರು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ಕರೆ ಮಾಡಲು ವೈಯಕ್ತಿಕ ಡಯಲರ್ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a33c999..0388481 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> 대신 <xliff:g id="NEW_APP">%1$s</xliff:g>을(를) 기본 다이얼러 앱으로 사용하시겠습니까?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g>을(를) 기본 다이얼러 앱으로 사용하시겠습니까?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"차단된 번호"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"이 목록의 번호로부터 수신되는 전화와 문자 메시지가 차단됩니다."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"차단한 번호에서 걸려오는 전화나 문자를 더 이상 받지 않습니다."</string>
     <string name="block_number" msgid="1101252256321306179">"번호 추가"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>번을 차단 해제하시겠습니까?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"차단 해제"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"전화와 문자 메시지를 차단할 번호"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"번호 또는 이메일 주소"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"전화번호"</string>
     <string name="block_button" msgid="8822290682524373357">"차단"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"기기 소유자만 차단된 번호를 보고 관리할 수 있습니다."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"차단 해제하려면 탭하세요."</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"차단 기능이 일시적으로 중지됨"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"긴급 전화번호로 전화를 걸거나 문자를 보내면 긴급 서비스를 사용할 수 있도록 차단 기능이 중지됩니다."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"지금 다시 사용 설정"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"전화를 걸 때 개인 다이얼러 사용"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index b12e9c0..eb96ed4 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Демейки номер тергич колдонмо катары мурунку <xliff:g id="CURRENT_APP">%2$s</xliff:g> колдонмонун ордуна <xliff:g id="NEW_APP">%1$s</xliff:g> бул колдонмо колдонулсунбу?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Демейки номер тергич колдонмо катары <xliff:g id="NEW_APP">%s</xliff:g> колдонулсунбу?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Бөгөттөлгөн номерлер"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Бул тизмедеги номерлерден келген чалуулар менен SMS билдирүүлөр бөгөттөлгөн."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Сиз бөгөлгөн номурлардан чалуу же тексттерди албайсыз."</string>
     <string name="block_number" msgid="1101252256321306179">"Номер кошуу"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> бөгөттөн чыгарылсынбы?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Бөгөттөн чыгаруу"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Төмөнкү номерден келген чалуулар менен SMS билдирүүлөрүн бөгөттөө"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Телефон номери же электрондук почта"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Телефон номуру"</string>
     <string name="block_button" msgid="8822290682524373357">"Бөгөттөө"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Бөгөттөлгөн номерлерди түзмөк ээси гана көрүп жана башкара алат."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Бөгөттөн чыгаруучу өтмөк"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Бөгөө убактылуу өчүк"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Кокустук номурун терип же текст жибергенден кийин кокустук кызматтары сизге кайрыла алышы үчүн бөгөө өчүрүлгөн."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Азыр кайра жандыруу"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Чалууларды аткаруу үчүн жеке тергич колдонулууда"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index c1909e8..cba3327 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"ໃຊ້ <xliff:g id="NEW_APP">%1$s</xliff:g> ແທນ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ເປັນ​ແອັບ​ແຜ່ນ​ກົດ​ມາດ​ຕະ​ຖານ​ຂອງ​ທ່ານ?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"ໃຊ້ <xliff:g id="NEW_APP">%s</xliff:g> ເປັນ​ແອັບ​ແຜ່ນ​ກົດ​ມາດ​ຕະ​ຖານ​ຂອງ​ທ່ານ?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"ເບີໂທລະສັບທີ່ບລັອກໄວ້"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ການໂທ ແລະ ຂໍ້ຄວາມຈາກເບີໂທທີ່ຢູ່ໃນບັນຊີນີ້ແມ່ນຖືກບລັອກໄວ້."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ທ່ານຈະບໍ່ໄດ້ຮັບສາຍ ຫຼື ຂໍ້ຄວາມຈາກເບີທີ່ບລັອກໄວ້."</string>
     <string name="block_number" msgid="1101252256321306179">"ເພີ່ມເບີໂທລະສັບ"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"ຍົກເລີກການບລັອກ <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ບໍ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"ຍົກເລີກການບລັອກ"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ບລັອກການໂທ ແລະ ຂໍ້ຄວາມຈາກ"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"ເບີໂທລະສັບ ຫຼື ອີເມວ"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ເບີໂທລະສັບ"</string>
     <string name="block_button" msgid="8822290682524373357">"ບລັອກ"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ມີແຕ່ເຈົ້າຂອງອຸປະກອນເທົ່ານັ້ນທີ່ສາມາດເບິ່ງ ແລະ ຈັດການເບີທີ່ຖືກບລັອກໄວ້."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"ແຕະເພື່ອຍົກເລີກການບລັອກ"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ຍົກເລີກການບລັອກຊົ່ວຄາວ"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"ຫຼັງຈາກທີ່ທ່ານໂທ ຫຼື ສົ່ງຂໍ້ຄວາມຫາເບີສຸກເສີນໃດໜຶ່ງແລ້ວ, ການບລັອກຈະຖືກປິດໄວ້ເພື່ອໃຫ້ແນ່ໃຈວ່າບໍລິການສຸກເສີນດັ່ງກ່າວຈະສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ເປີດໃຊ້ຄືນໃໝ່ດຽວນີ້"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ໃຊ້ແປ້ນໂທສ່ວນຕົວເພື່ອໂທອອກ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 75e38dd..3ebb441 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Naudoti „<xliff:g id="NEW_APP">%1$s</xliff:g>“ vietoje „<xliff:g id="CURRENT_APP">%2$s</xliff:g>“ kaip numatytąją numerio rinkiklio programą?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Naudoti „<xliff:g id="NEW_APP">%s</xliff:g>“ kaip numatytąją numerio rinkiklio programą?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Užblokuoti numeriai"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Skambučiai ir teksto pranešimai iš šio numerio yra užblokuoti."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Negausite skambučių ar teksto pranešimų iš užblokuotų numerių."</string>
     <string name="block_number" msgid="1101252256321306179">"Pridėti numerį"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Panaikinti <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> blokavimą?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Atblokuoti"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokuoti skambučius ir teksto pranešimus nuo"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numeris arba el. pašto adresas"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefono numeris"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokuoti"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Tik įrenginio savininkas gali peržiūrėti ir tvarkyti užblokuotus numerius."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Palieskite, kad panaikintumėte blokavimą"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokavimo funkcija laikinai išjungta"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Surinkus pagalbos numerį ar išsiuntus juo pranešimą blokavimo funkcija išjungiama, siekiant užtikrinti, kad pagalbos tarnybos galėtų su jumis susisiekti."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Dabar įgalinti iš naujo"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Asmeninio numerio rinkiklio naudojimas skambinant"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 77e89fe..0a6bee8 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Vai lietotnes <xliff:g id="CURRENT_APP">%2$s</xliff:g> vietā izmantot <xliff:g id="NEW_APP">%1$s</xliff:g> kā numura sastādītāja noklusējuma lietotni?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Vai izmantot <xliff:g id="NEW_APP">%s</xliff:g> kā numura sastādītāja noklusējuma lietotni?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Bloķētie numuri"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"No šajā sarakstā ietvertajiem numuriem saņemtie zvani un ziņojumi tiek bloķēti."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Jūs nesaņemsiet zvanus vai īsziņas no bloķētiem numuriem."</string>
     <string name="block_number" msgid="1101252256321306179">"Pievienot numuru"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Vai atbloķēt numuru <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Atbloķēt"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloķēt ienākošos zvanus un ziņojumus no numura"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Tālruņa numurs vai e-pasta adrese"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Tālruņa numurs"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloķēt"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Tikai ierīces īpašnieks var skatīt un pārvaldīt bloķētos numurus."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Pieskarieties, lai atbloķētu"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Bloķēšana īslaicīgi izslēgta"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Pēc avārijas dienesta numura sastādīšanas vai īsziņas sūtīšanas uz to tiek izslēgta bloķēšana, lai avārijas dienesti varētu ar jums sazināties."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Atkārtoti iespējot tūlīt"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Zvans tiek veikts, izmantojot personisko numura sastādītāju"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index ad54fa2..f5e70e2 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Користи <xliff:g id="NEW_APP">%1$s</xliff:g> наместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> како стандардна апликација за бирање?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Користи <xliff:g id="NEW_APP">%s</xliff:g> како стандардна апликација за бирање?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Блокирани броеви"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Повиците и текстовите од броевите на овој список се блокирани."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Нема да добивате повици или текстуални пораки од блокирани броеви."</string>
     <string name="block_number" msgid="1101252256321306179">"Додај број"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Деблокирајте го <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Деблокирај"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Блокирај повици и текстови од"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Број или е-пошта"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Телефонски број"</string>
     <string name="block_button" msgid="8822290682524373357">"Блокирај"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Само сопственикот на уредот може да ги прикаже и да управува со блокираните броеви."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Картичка за деблокирање"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Блокирањето е привремено исклучено"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Откако ќе повикате или ќе испратите текстуална порака на број за итни случаи, блокирањето се исклучува за да може да ве контактираат службите за итни случаи."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Овозможи сега повторно"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Користење на личниот бирач за остварување повик"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index c554f4e..960390a 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> എന്നതിനുപകരം <xliff:g id="NEW_APP">%1$s</xliff:g> എന്നതിനെ നിങ്ങളുടെ സ്ഥിര ഡയലർ ആപ്പ് ആയി ഉപയോഗിക്കണോ?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> എന്നതിനെ നിങ്ങളുടെ സ്ഥിര ഡയലർ ആപ്പ് ആയി ഉപയോഗിക്കണോ?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"ബ്ലോക്കുചെയ്ത നമ്പറുകൾ"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ഈ ലിസ്റ്റിലെ നമ്പറുകളിൽ നിന്നുള്ള കോളുകളും ടെക്സ്റ്റുകളും ബ്ലോക്കുചെയ്തു."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ബ്ലോക്കുചെയ്‌ത നമ്പറുകളിൽ നിന്ന് നിങ്ങൾക്ക് കോളുകളോ സന്ദേശങ്ങളോ ലഭിക്കില്ല."</string>
     <string name="block_number" msgid="1101252256321306179">"ഒരു നമ്പർ ചേർക്കുക"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> അൺബ്ലോക്കുചെയ്യണോ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"അൺബ്ലോക്കുചെയ്യുക"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള കോളുകളും ടെക്സ്റ്റുകളും ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"നമ്പർ അല്ലെങ്കിൽ ഇമെയിൽ"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ഫോൺ നമ്പർ"</string>
     <string name="block_button" msgid="8822290682524373357">"ബ്ലോക്കുചെയ്യുക"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ബ്ലോക്കുചെയ്ത നമ്പറുകൾ ഉപകരണ ഉടമയ്ക്ക് മാത്രമേ കാണാനും മാനേജുചെയ്യാനും കഴിയൂ."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"അൺബ്ലോക്കുചെയ്യുന്നതിനുള്ള ടാബ്"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ബ്ലോക്കുചെയ്യൽ താൽക്കാലികമായി ഓഫാണ്"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"നിങ്ങൾ ഒരു എമർജൻസി നമ്പർ ഡയൽ ചെയ്‌ത് കഴിയുമ്പോഴോ അതിലേക്ക് സന്ദേശമയച്ചുകഴിയുമ്പോഴോ, എമർജൻസി സേവനങ്ങൾ നിങ്ങളിലേക്ക് എത്തുമെന്ന് ഉറപ്പാക്കാൻ ബ്ലോക്കുചെയ്യൽ ഓഫാക്കും."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ഇപ്പോൾ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"കോൾ ചെയ്യുന്നതിന് സ്വകാര്യ ഡയലർ ഉപയോഗിക്കുന്നു"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 39af057..a2293fc 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g>-ыг <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ын оронд таны үндсэн залгагч апп болгон тохируулах уу?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g>-ыг таны үндсэн залгагч апп болгон тохируулах уу?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Блоклосон дугаар"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Энэ жагсаалтад байгаа дугаараас ирэх дуудлага, текстийг блоклосон."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Та хориглосон дугаараас дуудлага, мессеж хүлээн авахгүй."</string>
     <string name="block_number" msgid="1101252256321306179">"Дугаар нэмэх"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>-г блокоос гаргах уу?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Блокоос гаргах"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Дараахаас ирэх дуудлага, текстийг блоклох"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Дугаар эсвэл имэйл"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Утасны дугаар"</string>
     <string name="block_button" msgid="8822290682524373357">"Блоклох"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Зөвхөн энэ төхөөрөмжийн эзэн блоклосон дугаарыг харж, өөрчлөх боломжтой."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Блокоос гаргахын тулд дарна уу"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Дугаар хориглох түр хугацаанд идэвхгүй болсон"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Түргэн тусламжийн дугаар руу залгах буюу мессеж бичсэний дараа түргэн тусламжаас тантай холбогдох боломжтой байлгахын тулд дугаар хориглохыг идэвхгүй болгоно."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Одоо дахин идэвхжүүлэх"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Дуудлага хийхийн тулд хувийн залгагчийг ашиглаж байна"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 3129064..5de0df8 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"आपला डीफॉल्ट डायलर अॅप म्हणून <xliff:g id="CURRENT_APP">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> वापरायचा?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"आपला डीफॉल्ट डायलर अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"अवरोधित केलेले नंबर"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"या सूचीमधील नंबरवरील कॉल आणि मजकूर अवरोधित केले आहेत."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"आपल्याला अवरोधित नंबरवरून कॉल किंवा मजकूर प्राप्त होणार नाहीत."</string>
     <string name="block_number" msgid="1101252256321306179">"एक नंबर जोडा"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> अनावरोधित करायचा?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"अनावरोधित करा"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"यावरील कॉल आणि मजकूर अवरोधित करा"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"नंबर किंवा ईमेल"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"फोन नंबर"</string>
     <string name="block_button" msgid="8822290682524373357">"अवरोधित करा"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"फक्त डिव्हाइस मालक अवरोधित केलेले नंबर पाहू आणि व्यवस्थापित करू शकतो."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"अनावरोधित करण्यासाठी टॅब"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"अवरोधित करणे तात्पुरते बंद आहे"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"आपण एखादा आणीबाणी नंबर डायल केला किंवा त्यावर मजकूर पाठविल्यानंतर, आणीबाणी सेवा आपल्याशी संपर्क साधू शकतात हे सुनिश्चित करण्यासाठी अवरोधित करणे बंद करते."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"आता पुन्हा-सक्षम करा"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"कॉल करण्यासाठी वैयक्तिक डायलर वापरणे"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 08c4e9e..cfed223 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> dan bukannya <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai apl pendail lalai anda?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai apl pendail lalai anda?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Nombor yang disekat"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Panggilan dan teks daripada nombor dalam senarai ini disekat."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Anda tidak akan menerima panggilan atau teks daripada nombor yang disekat."</string>
     <string name="block_number" msgid="1101252256321306179">"Tambahkan nombor"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Nyahsekat <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Nyahsekat"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Sekat panggilan dan teks daripada"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nombor atau e-mel"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Nombor telefon"</string>
     <string name="block_button" msgid="8822290682524373357">"Sekat"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Hanya pemilik peranti boleh melihat dan menguruskan nombor yang disekat."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab untuk nyahsekat"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Sekatan dimatikan untuk sementara waktu"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Sekatan dimatikan selepas anda mendail atau menghantar teks kepada nombor kecemasan untuk memastikan perkhidmatan kecemasan dapat menghubungi anda."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Dayakan semula sekarang"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Menggunakan pendail peribadi untuk membuat panggilan"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 6ff4b5a..0be34bd 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> အစား <xliff:g id="NEW_APP">%1$s</xliff:g> ကိုသင့်ရဲ့ စက်ရုံထုတ်ဖုန်းခေါ်အပ်ဖ်အဖြစ် သုံးလိုပါသလား"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> ကိုသင့်ရဲ့စက်ရုံထုတ်ဖုန်းခေါ်အပ်ဖ်အဖြစ် သုံးလိုပါသလား"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"ပိတ်ဆို့ထားသည့် နံပါတ်များ"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ဤစာရင်းထဲရှိ နံပါတ်များမှ စာများနှင့် ခေါ်ဆိုမှုများကို ပိတ်ဆို့ထားပါသည်။"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"သင်သည် ဘလော့ခ်လုပ်ထားသော နံပါတ်များမှ ဖုန်းခေါ်ခြင်း (သို့) စာသားပို့ခြင်းတို့ကို လက်ခံရရှိမည် မဟုတ်ပါ။"</string>
     <string name="block_number" msgid="1101252256321306179">"နံပါတ်တစ်ခု ထည့်ပါ"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ကို ပိတ်ဆို့မှုပြန်ဖွင့်မလား။"</string>
     <string name="unblock_button" msgid="3078048901972674170">"ပိတ်ဆို့မှုပြန်ဖွင့်ပါ"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ဖော်ပြပါပုဂ္ဂိုလ်ထံမှ စာနှင့် ခေါ်ဆိုမှုများကို ပိတ်ဆို့ပါ"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"နံပါတ် သို့မဟုတ် အီးမေးလ်"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ဖုန်းနံပါတ်"</string>
     <string name="block_button" msgid="8822290682524373357">"ပိတ်ဆို့ပါ"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ပိတ်ဆို့ထားသည့် နံပါတ်များကို စက်ပစ္စည်းပိုင်ရှင်သာလျှင် ကြည့်ရှု၍ စီမံခန့်ခွဲနိုင်ပါသည်။"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"ပိတ်ဆို့မှုပြန်ဖွင့်ရန် တို့ပါ"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ဘလော့ခ်လုပ်ခြင်းကို ပိတ်ထားပါသည်"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"သင် အရေးပေါ်နံပါတ်တစ်ခုကို ဖုန်းခေါ် (သို့) စာသားပို့ပြီးနောက် အရေးပေါ်ဝန်ဆောင်မှုများက သင့်ကို ဆက်သွယ်နိုင်ကြောင်း သေချာစေရန် ဘလော့ခ်လုပ်ခြင်းကို ပိတ်ထားပါသည်။"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ယခု ပြန်ဖွင့်လိုက်ပါ"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ဖုန်းခေါ်ဆိုမှုပြုလုပ်ရန် ကိုယ်ရေးကိုယ်တာ ဖုန်းခေါ်ဆိုမှုစနစ်ကို အသုံးပြုခြင်း"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 07d12d0..0ec862f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Vil du bruke <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> som standard telefonapp?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Vil du bruke <xliff:g id="NEW_APP">%s</xliff:g> som standard telefonapp?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokkerte numre"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Anrop og meldinger fra numrene på denne listen er blokkerte."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Du mottar ingen anrop eller tekstmeldinger fra blokkerte numre."</string>
     <string name="block_number" msgid="1101252256321306179">"Legg til et nummer"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Vil du oppheve blokkeringen av <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Opphev blokkering"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokkér anrop og meldinger fra"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nummer eller e-post"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonnummer"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokkér"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Bare enhetseieren kan se og administrere blokkerte numre."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Trykk for å oppheve blokkeringen"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokkeringen er midlertidig slått av"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Når du har ringt eller sendt tekstmelding til et nødnummer, blir blokkeringen slått av, sånn at nødtjenesten har mulighet til å kontakte deg."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Slå på igjen nå"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Ring via den personlige ringeappen"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 3b54140..8becd4a 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g>को सट्टामा <xliff:g id="NEW_APP">%1$s</xliff:g>लाई पूर्वनिर्धारित डायलर अनुप्रयोगको रूपमा प्रयोग गर्ने हो?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g>लाई तपाईँको पूर्वनिर्धारित डायलर अनुप्रयोगको रूपमा प्रयोग गर्ने हो?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"रोकिएका नम्बरहरू"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"यस सूचीका नम्बरहरूबाट आउने कल र पाठ सन्देशहरू रोकिएका छन्।"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"तपाईँले रोक लगाइएका नम्बरहरूबाट फोन वा पाठ सन्देशहरू प्राप्त गर्नुहुने छैन।"</string>
     <string name="block_number" msgid="1101252256321306179">"नम्बर थप्नुहोस्"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> लाई अनब्लक गर्ने हो?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"अनब्लक गर्नुहोस्"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"यस नम्बरबाट कल र पाठ सन्देशहरूलाई रोक्नुहोस्"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"नम्बर वा इमेल"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"फोन नम्बर"</string>
     <string name="block_button" msgid="8822290682524373357">"रोक्नुहोस्"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"यन्त्रको मालिकले रोकिएका नम्बरहरूलाई हेर्न र व्यवस्थापन गर्न सक्छ।"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"अनब्लक गर्ने ट्याब"</string>
-    <string name="toast_personal_call_msg" msgid="5115361633476779723">"कल गर्न व्यक्तिगत डायलर प्रयोग गर्नुहोस्"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"रोक लगाउने काम अस्थायी रूपमा निष्क्रिय छ"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"तपाईँले आपतकालीन नम्बरमा डायल गरेपछि वा पाठ सन्देश पठाएपछि आपतकालीन सेवाहरूले तपाईँलाई सम्पर्क गर्न सक्छन् भन्ने कुरा सुनिश्चित गर्न कलमाथिको अवरोध निष्क्रिय गरिन्छ।"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"अब पुन:-सक्रिय गर्नुहोस्"</string>
+    <string name="toast_personal_call_msg" msgid="5115361633476779723">"कल गर्न व्यक्तिगत डायलर प्रयोग गर्दै"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2a53f56..7186369 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g> in plaats van <xliff:g id="CURRENT_APP">%2$s</xliff:g> gebruiken als standaard kiezerapp?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> gebruiken als standaard kiezerapp?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Geblokkeerde nummers"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Oproepen en sms\'jes van nummers op deze lijst worden geblokkeerd."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Je ontvangt geen oproepen of sms\'jes van geblokkeerde nummers."</string>
     <string name="block_number" msgid="1101252256321306179">"Een nummer toevoegen"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Blokkering van <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> opheffen?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Blokkering opheffen"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Oproepen en sms\'jes blokkeren van"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nummer of e-mailadres"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefoonnummer"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokkeren"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Alleen de eigenaar van het apparaat kan geblokkeerd nummers bekijken en beheren."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tik om blokkering op te heffen"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokkering tijdelijk uitgeschakeld"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Als je een noodnummer belt of hier een sms naar stuurt, wordt de blokkering uitgeschakeld om te zorgen dat hulpdiensten contact met je kunnen opnemen."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Nu opnieuw inschakelen"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"De persoonlijke kiezer gebruiken om te bellen"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 39d8560..e9145d4 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"ਕੀ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ਦੀ ਬਜਾਏ <xliff:g id="NEW_APP">%1$s</xliff:g> ਨੂੰ ਆਪਣੀ ਡਿਫ਼ੌਲਟ ਡਾਇਲਰ ਐਪ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਹੈ?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"ਕੀ <xliff:g id="NEW_APP">%s</xliff:g> ਨੂੰ ਆਪਣੀ ਡਿਫ਼ੌਲਟ ਡਾਇਲਰ ਐਪ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਹੈ?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰ"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ਇਸ ਸੂਚੀ ਵਿੱਚ ਦਿੱਤੇ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਅਤੇ ਟੈਕਸਟ ਬਲੌਕ ਕੀਤੇ ਗਏ ਹਨ।"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ਤੁਹਾਨੂੰ ਬਲੌਕ ਕੀਤੇ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਜਾਂ ਲਿਖਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੇ।"</string>
     <string name="block_number" msgid="1101252256321306179">"ਇੱਕ ਨੰਬਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"ਕੀ <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ਨੂੰ ਅਣਬਲੌਕ ਕਰਨਾ ਹੈ?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"ਅਣਬਲੌਕ ਕਰੋ"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਅਤੇ ਟੈਕਸਟ ਨੂੰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"ਨੰਬਰ ਜਾਂ ਈਮੇਲ"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ਫੋਨ ਨੰਬਰ"</string>
     <string name="block_button" msgid="8822290682524373357">"ਬਲੌਕ ਕਰੋ"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"ਸਿਰਫ਼ ਡੀਵਾਈਸ ਮਾਲਕ ਹੀ ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰਾਂ ਨੂੰ ਵੇਖ ਅਤੇ ਪ੍ਰਬੰਧਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"ਅਣਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ਬਲੌਕਿੰਗ ਆਰਜ਼ੀ ਤੌਰ \'ਤੇ ਬੰਦ ਹੈ"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਇੱਕ ਐਮਰਜੈਂਸੀ ਨੰਬਰ ਨੂੰ ਡਾਇਲ ਕੀਤੇ ਜਾਣ ਜਾਂ ਲਿਖਤ ਸੁਨੇਹਾ ਭੇਜੇ ਜਾਣ ਤੋਂ ਬਾਅਦ, ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਬਲੌਕਿੰਗ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਕਿ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਤੁਹਾਨੂੰ ਸੰਪਰਕ ਕਰ ਸਕਣ।"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ਹੁਣੇ ਦੁਬਾਰਾ ਯੋਗ ਬਣਾਓ"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ਕਾਲ ਕਰਨ ਲਈ ਨਿੱਜੀ ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਕਰਨੀ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b75c3ca..de9b0ec 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Zmienić <xliff:g id="CURRENT_APP">%2$s</xliff:g> na <xliff:g id="NEW_APP">%1$s</xliff:g> jako domyślną aplikację telefonu?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Ustawić <xliff:g id="NEW_APP">%s</xliff:g> jako domyślną aplikację telefonu?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Zablokowane numery"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Połączenia i SMS-y z numerów na tej liście są blokowane."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Nie będziesz otrzymywać połączeń ani SMS-ów z zablokowanych numerów."</string>
     <string name="block_number" msgid="1101252256321306179">"Dodaj numer"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Odblokować <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Odblokuj"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokuj połączenia i SMS-y z:"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numer lub e-mail"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Numer telefonu"</string>
     <string name="block_button" msgid="8822290682524373357">"Zablokuj"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Tylko właściciel urządzenia może przeglądać zablokowane numery i nimi zarządzać."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Kliknij, by odblokować"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokada tymczasowo wyłączona"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Gdy wybierzesz numer awaryjny lub wyślesz pod ten numer SMS-a, blokada zostanie wyłączona, aby odpowiednie służby mogły się z Tobą skontaktować."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Włącz ponownie"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Wykonuję połączenie z osobistego telefonu"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9912d56..6ba37d9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a aplicação de telefone predefinida?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a aplicação de telefone predefinida?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Números bloqueados"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"As chamadas e mensagens de texto dos números nesta lista são bloqueadas."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Não irá receber chamadas ou mensagens de texto de números bloqueados."</string>
     <string name="block_number" msgid="1101252256321306179">"Adicionar um número"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Pretende desbloquear <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desbloquear"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquear chamadas e mensagens de texto de"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Número ou email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Número de telefone"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquear"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Apenas o proprietário do dispositivo pode ver e gerir os números bloqueados."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tocar para desbloquear"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Bloqueio temporariamente desativado"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Após marcar ou enviar uma mensagem de texto para um número de emergência, o bloqueio é desativado para garantir que os serviços de emergência conseguem contactá-lo."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Reativar agora"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"A utilizar o telefone pessoal para efetuar a chamada"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 701b7cc..7f474f6 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Usar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como seu app discador padrão?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Usar <xliff:g id="NEW_APP">%s</xliff:g> como seu app discador padrão?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Números bloqueados"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"As chamadas e mensagens de texto de números desta lista estão bloqueadas."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Você não receberá chamadas nem mensagens de texto dos números bloqueados."</string>
     <string name="block_number" msgid="1101252256321306179">"Adicionar um número"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Desbloquear <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Desbloquear"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bloquear chamadas e mensagens de texto de"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Número ou e-mail"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Nº de telefone"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloquear"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Apenas o proprietário do dispositivo pode ver e gerenciar os números bloqueados."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Toque para desbloquear"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Bloqueio temporariamente desativado"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Após discar ou enviar uma mensagem de texto para um número de emergência, o bloqueio é desativado para garantir o contato do serviço de emergência com você."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Reativar agora"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Usando o discador pessoal para fazer a chamada"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c1a36b3..aeb1920 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Folosiți <xliff:g id="NEW_APP">%1$s</xliff:g> și nu <xliff:g id="CURRENT_APP">%2$s</xliff:g> ca aplicație de telefonie prestabilită?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Folosiți <xliff:g id="NEW_APP">%s</xliff:g> ca aplicație de telefonie prestabilită?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Numere blocate"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Apelurile și mesajele text de la numerele din această listă sunt blocate."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Nu veți primi apeluri sau mesaje text de la numerele blocate."</string>
     <string name="block_number" msgid="1101252256321306179">"Adăugați un număr"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Deblocați <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Deblocați"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blocați apelurile și mesajele text de la"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Număr sau adresă de e-mail"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Număr de telefon"</string>
     <string name="block_button" msgid="8822290682524373357">"Blocați"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Numai proprietarul dispozitivului poate vedea și gestiona numerele blocate."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Atingeți pentru a debloca"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blocarea este dezactivată temporar"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"După ce formați un număr de urgență sau trimiteți un mesaj la acesta, blocarea este dezactivată pentru ca serviciile de urgență să vă poată contacta."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Reactivați acum"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Utilizarea telefonului personal pentru a apela"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f721c5f..8903dfe 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"\"<xliff:g id="NEW_APP">%1$s</xliff:g>\" станет приложением для звонков по умолчанию вместо \"<xliff:g id="CURRENT_APP">%2$s</xliff:g>\". Продолжить?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"\"<xliff:g id="NEW_APP">%s</xliff:g>\" станет приложением для звонков по умолчанию. Продолжить?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Заблокированные номера"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Звонки и сообщения с этих номеров блокируются."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Звонки и сообщения с заблокированных номеров поступать не будут."</string>
     <string name="block_number" msgid="1101252256321306179">"Добавить номер"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Разблокировать номер <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Разблокировать"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Блокировать звонки и сообщения с"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Телефон или адрес эл. почты"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Номер телефона"</string>
     <string name="block_button" msgid="8822290682524373357">"Заблокировать"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Просматривать и изменять список заблокированных номеров может только владелец устройства."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Нажмите, чтобы разблокировать"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Блокировка временно снята"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"После набора номера экстренной службы или отправки сообщения на этот номер, блокировка устройства будет выключена."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Заблокировать"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Набор номера с помощью персонализированной панели"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index b8a9b69..258d2da 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> වෙනුවට <xliff:g id="NEW_APP">%1$s</xliff:g> ඔබගේ සුපුරුදු දුරකථන යෙදුම ලෙස භාවිතා කරන්නද?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> ඔබගේ සුපුරුදු දුරකථන යෙදුම ලෙස භාවිතා කරන්නද?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"අවහිර කළ අංක"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"මෙම ලැයිස්තුව වෙතින් වන අංක හා පෙළ අවහිර කර ඇත."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ඔබට අවහිර කළ අංකයවලින් ඇමතුම් හෝ පෙළ නොලැබෙනු ඇත."</string>
     <string name="block_number" msgid="1101252256321306179">"අංකයක් එක් කරන්න"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> අවහිර නොකරන්නද?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"අවහිර නොකරන්න"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ඇමතුම් හා පෙළ අවහිර කරන්න"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"අංකය හෝ ඊ-තැපැල්"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"දුරකථන අංකය"</string>
     <string name="block_button" msgid="8822290682524373357">"අවහිර කරන්න"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"උපාංගය හිමිකරුට පමණක් අවහිර අංක බැලීමට සහ කළමනාකරණය කිරීමට හැකිය."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"අවහිර නොකිරීමේ කිරීමේ ටැබය"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"අවහිර කිරීම තාවකාලිකව අක්‍රියයි"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"ඔබ හදිසි ඇමතුම් අංකයක් ඩයල් කිරීමෙන් හෝ පෙළ පණිවිඩයක් යැවීමෙන් පසු, හදිසි අවස්ථා සේවාවලට ඔබට ඇමතිය හැකි බව තහවුරු කිරීමට අවහිර කිරීම අක්‍රිය කරයි."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"දැන් නැවත-සබල කරන්න"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"ඇමතුම ගැනීමට පුද්ගලික ඩයල්කරු භාවිත කරමින්"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1bea5e2..ca70677 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Chcete použiť aplikáciu <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto aplikácie <xliff:g id="CURRENT_APP">%2$s</xliff:g> ako predvolenú aplikáciu vytáčania?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Chcete použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> ako predvolenú aplikáciu vytáčania?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokované čísla"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Hovory aj textové správy z čísel v tomto zozname sú blokované."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Z blokovaných čísel nebudete prijímať hovory ani textové správy."</string>
     <string name="block_number" msgid="1101252256321306179">"Pridať číslo"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Odblokovať číslo <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Odblokovať"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokovať hovory a textové správy z čísla"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Číslo alebo e-mailová adresa"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefónne číslo"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokovať"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Iba vlastník zariadenia môže zobrazovať a spravovať blokované čísla."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Klepnutím odblokujete"</string>
-    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Na zavolanie sa používa osobné vytáčanie"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokovanie je dočasne vypnuté"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Keď vytočíte číslo tiesňového volania alebo naň odošlete textovú správu, blokovanie bude vypnuté, aby vás mohli pohotovostné služby kontaktovať."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Znova zapnúť"</string>
+    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Na volanie sa používa osobné vytáčanie"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 440ca83..0e5ac36 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Želite <xliff:g id="NEW_APP">%1$s</xliff:g> uporabljati kot privzeto aplikacijo za klicanje namesto <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Želite <xliff:g id="NEW_APP">%s</xliff:g> uporabljati kot privzeto aplikacijo za klicanje?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blokirane številke"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Klici in SMS-ji s številk na tem seznamu so blokirani."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Z blokiranih številk ne boste prejemali klicev ali sporočil SMS."</string>
     <string name="block_number" msgid="1101252256321306179">"Dodaj številko"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Želite odblokirati številko <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Odblokiraj"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokiranje klicev in SMS-jev s številke"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Številka ali e-poštni naslov"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonska številka"</string>
     <string name="block_button" msgid="8822290682524373357">"Blokiraj"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Samo lastnik naprave si lahko ogleda blokirane številke in jih upravlja."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Dotaknite se, če želite odblokirati številko"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokiranje je začasno izklopljeno"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Ko izberete ali vnesete številko za klic v sili, se blokiranje izklopi, s čimer se zagotovi, da vas lahko pokličejo iz služb za nujne primere."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Znova omogoči zdaj"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Uporaba osebnega klicalnika za klic"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index f825e03..052fe84 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Të përdoret <xliff:g id="NEW_APP">%1$s</xliff:g> në vend të <xliff:g id="CURRENT_APP">%2$s</xliff:g> si aplikacioni i parazgjedhur i formuesit të numrave?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Të përdoret <xliff:g id="NEW_APP">%s</xliff:g> si aplikacioni i parazgjedhur i formuesit të numrave?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Numrat e bllokuar"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Telefonatat dhe mesazhet me tekst nga numrat në këtë listë janë të bllokuara."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Nuk do të marrësh telefonata ose mesazh me tekst nga numrat e bllokuar."</string>
     <string name="block_number" msgid="1101252256321306179">"Shto një numër"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Zhblloko <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Zhblloko"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blloko telefonatat dhe mesazhet me tekst nga"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numri ose maili"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Numri i telefonit"</string>
     <string name="block_button" msgid="8822290682524373357">"Blloko"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Vetëm zotëruesi i pajisjes mund të shikojë dhe të menaxhojë numrat e bllokuar."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Skeda për zhbllokimin"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Bllokimi përkohësisht joaktiv"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Pasi shtypet ose dërgohet mesazh me tekst te një numër i urgjencës, bllokimi është çaktivizuar për të siguruar që shërbimet e emergjencës të mund të të kontaktojnë."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Riaktivizo tani"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Po përdor formuesin personal të numrave për të kryer telefonatën"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 82cfb29..cbba254 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Желите ли да користите апликацију <xliff:g id="NEW_APP">%1$s</xliff:g> уместо апликације <xliff:g id="CURRENT_APP">%2$s</xliff:g> као подразумевану апликацију за позивање телефонских бројева?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Желите ли да користите апликацију <xliff:g id="NEW_APP">%s</xliff:g> као подразумевану апликацију за позивање телефонских бројева?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Блокирани бројеви"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Позиви и SMS-ови са бројева на овој листи су блокирани."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Нећете примати позиве ни SMS-ове са блокираних бројева."</string>
     <string name="block_number" msgid="1101252256321306179">"Додај број"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Желите ли да деблокирате <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Деблокирај"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Блокирајте позиве и SMS-ове од"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Број или имејл"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Број телефона"</string>
     <string name="block_button" msgid="8822290682524373357">"Блокирај"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Само власник уређаја може да прегледа блокиране бројеве и управља њима."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Додирните да бисте деблокирали"</string>
-    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Коришћење личног бројчаника за упућивање позива"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Блокирање је привремено искључено"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Кад позовете број хитне службе или на тај број пошаљете SMS, блокирање се искључује да би хитне службе могле да вас контактирају."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Поново омогући"</string>
+    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Коришћење бројчаника из личног профила за упућивање позива"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 40cb5bb..d59db65 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Vill du använda <xliff:g id="NEW_APP">%1$s</xliff:g> i stället för <xliff:g id="CURRENT_APP">%2$s</xliff:g> som standardapp för uppringning?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Vill du använda <xliff:g id="NEW_APP">%s</xliff:g> som standardapp för uppringning?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Blockerade nummer"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Samtal och sms från telefonnummer i den här listan blockeras."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Du kommer inte ta emot samtal eller sms från blockerade nummer."</string>
     <string name="block_number" msgid="1101252256321306179">"Lägg till ett telefonnummer"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Vill du häva blockeringen av <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Häv blockering"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blockera samtal och sms från"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Telefonnummer eller e-postadress"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonnummer"</string>
     <string name="block_button" msgid="8822290682524373357">"Blockera"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Bara enhetens ägare kan se och hantera blockerade nummer."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tryck här om du vill häva blockeringen"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blockeringen har inaktiverats tillfälligt"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"När du ringer eller sms:ar ett nödnummer inaktiveras blockering för att säkerställa att räddningstjänsten kan kontakta dig."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Återaktivera nu"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Ringer med den egna uppringningsfunktionen"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index df27bb0..f123ca9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kama programu ya chaguo-msingi ya kupigia simu?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> kama programu ya chaguo-msingi ya kupigia simu?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Nambari zilizozuiwa"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Simu na SMS kutoka nambari zilizo kwenye orodha hii zimezuiwa."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Hutapokea simu au SMS kutoka kwa nambari zilizozuiwa."</string>
     <string name="block_number" msgid="1101252256321306179">"Ongeza nambari"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Ungependa kuondoa kizuizi kwenye <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Ondoa kizuizi"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Zuia simu na SMS kutoka kwa"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Nambari au anwani ya barua pepe"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Nambari ya simu"</string>
     <string name="block_button" msgid="8822290682524373357">"Zuia"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Ni mmiliki wa kifaa pekee anayeweza kuangalia na kuthibiti nambari zilizozuiwa."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Kichupo cha kuondoa kizuizi"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Kipengele cha kuzuia kimezimwa kwa muda"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Ukishapiga au kutuma ujumbe kwa nambari ya dharura, kipengele cha kuzuia anwani huzimwa ili watoa huduma za dharura waweze kuwasiliana nawe."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Kiwashe tena sasa"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Kupiga simu kwa kutumia kipiga simu cha binafsi"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 2db66cf..6df9e94 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="NEW_APP">%1$s</xliff:g>ஐ <xliff:g id="CURRENT_APP">%2$s</xliff:g>க்குப் பதிலாக, இயல்புநிலை டயலர் பயன்பாடாகப் பயன்படுத்தவா?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g>ஐ இயல்புநிலை டயலர் பயன்பாடாகப் பயன்படுத்தவா?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"தடுக்கப்பட்ட எண்கள்"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"இந்தப் பட்டியலில் உள்ள எண்களின் அழைப்புகளும் உரைச்செய்திகளும் தடுக்கப்படும்."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"தடுக்கப்பட்ட எண்களிலிருந்து அழைப்புகள் அல்லது உரைச் செய்திகளைப் பெறமாட்டீர்கள்."</string>
     <string name="block_number" msgid="1101252256321306179">"எண்ணைச் சேர்"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>ஐ அனுமதிக்கவா?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"அனுமதி"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"இந்த எண்ணிலிருந்து வரும் அழைப்புகளையும் உரைச்செய்திகளையும் தடு:"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"எண் அல்லது மின்னஞ்சல்"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"மொபைல் எண்"</string>
     <string name="block_button" msgid="8822290682524373357">"தடு"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"சாதன உரிமையாளர் மட்டுமே தடுக்கப்பட்ட எண்களைப் பார்க்கவும் நிர்வகிக்கவும் முடியும்."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"அனுமதிக்க, தட்டவும்"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"அழைப்புத் தடுப்பு அம்சம் தற்காலிகமாக முடக்கப்பட்டுள்ளது"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"அவசர அழைப்பு எண்ணை அழைத்த பிறகு அல்லது அதற்கு உரைச் செய்தியை அனுப்பிய பிறகு, அவசர அழைப்புச் சேவைகள் தொடர்புகொள்வதற்காக அழைப்புத் தடுப்பு அம்சம் முடக்கப்படுகிறது."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"இப்போதே மீண்டும் இயக்கு"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"தனிப்பட்ட டயலரைப் பயன்படுத்தி அழைக்கவும்"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index d4ea3ff..09b1c64 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"మీ డిఫాల్ట్ డయలర్ అనువర్తనంగా <xliff:g id="CURRENT_APP">%2$s</xliff:g> బదులు <xliff:g id="NEW_APP">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"మీ డిఫాల్ట్ డయలర్ అనువర్తనంగా <xliff:g id="NEW_APP">%s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"ఈ జాబితాలోని నంబర్‌ల నుండి వచ్చే కాల్‌లు మరియు సందేశాలు బ్లాక్ చేయబడతాయి."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"మీరు బ్లాక్ చేయబడిన నంబర్‌ల నుండి కాల్‌లు లేదా వచన సందేశాలను స్వీకరించరు."</string>
     <string name="block_number" msgid="1101252256321306179">"నంబర్‌ను జోడించు"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>ని అన్‌బ్లాక్ చేయాలా?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"అన్‌బ్లాక్ చేయి"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"దీని నుండి కాల్‌లు మరియు సందేశాలను బ్లాక్ చేయండి"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"నంబర్ లేదా ఇమెయిల్"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"ఫోన్ నంబర్"</string>
     <string name="block_button" msgid="8822290682524373357">"బ్లాక్ చేయి"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"కేవలం పరికర యజమాని మాత్రమే బ్లాక్ చేసిన నంబర్‌లను వీక్షించగలరు మరియు నిర్వహించగలరు."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"అన్‌బ్లాక్ చేయడానికి నొక్కండి"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"బ్లాకింగ్ తాత్కాలికంగా ఆఫ్ చేయబడింది"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"మీరు అత్యవసర నంబర్‌కి డయల్ చేసాక లేదా వచన సందేశం పంపాక, అత్యవసర సేవలు తిరిగి మిమ్మల్ని సంప్రదించగలిగేలా చేయడానికి బ్లాకింగ్ ఆఫ్ చేయబడుతుంది."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"ఇప్పుడే మళ్లీ ప్రారంభించు"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"కాల్ చేయడానికి వ్యక్తిగత డయలర్‌ను ఉపయోగిస్తోంది"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4afcffc..e0eec18 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"ใช้ <xliff:g id="NEW_APP">%1$s</xliff:g> เป็นแอปแป้นโทรศัพท์เริ่มต้นแทน <xliff:g id="CURRENT_APP">%2$s</xliff:g> ไหม"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"ใช้ <xliff:g id="NEW_APP">%s</xliff:g> เป็นแอปแป้นโทรศัพท์เริ่มต้นไหม"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"หมายเลขที่ถูกบล็อก"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"สายเรียกเข้าและข้อความจากหมายเลขในรายการนี้ถูกบล็อก"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"คุณจะไม่สามารถรับสายหรือข้อความจากหมายเลขที่บล็อกได้"</string>
     <string name="block_number" msgid="1101252256321306179">"เพิ่มหมายเลข"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"เลิกบล็อก <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="unblock_button" msgid="3078048901972674170">"เลิกบล็อก"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"บล็อกสายเรียกเข้าและข้อความจาก"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"หมายเลขหรืออีเมล"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"หมายเลขโทรศัพท์"</string>
     <string name="block_button" msgid="8822290682524373357">"บล็อก"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"มีเพียงเจ้าของอุปกรณ์เท่านั้นที่สามารถดูและจัดการหมายเลขที่ถูกบล็อก"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"แตะเพื่อเลิกบล็อก"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ปิดการบล็อกไว้ชั่วคราว"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"หลังจากส่งข้อความถึงหรือกดหมายเลขโทรศัพท์ฉุกเฉิน ระบบจะปิดการบล็อกเพื่อให้บริการฉุกเฉินติดต่อคุณได้"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"เปิดใช้งานอีกครั้งเลย"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"การใช้โทรศัพท์ส่วนตัวเพื่อทำการโทร"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9346357..89cb680 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Gamitin ang <xliff:g id="NEW_APP">%1$s</xliff:g> sa halip na <xliff:g id="CURRENT_APP">%2$s</xliff:g> bilang default na dialer app mo?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Gamitin ang <xliff:g id="NEW_APP">%s</xliff:g> bilang default na dialer app mo?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Mga naka-block na numero"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Bina-block ang mga tawag at text mula sa mga numerong nasa listahang ito."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Hindi ka makakatanggap ng mga tawag o mga text mula sa mga naka-block na numero."</string>
     <string name="block_number" msgid="1101252256321306179">"Magdagdag ng numero"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Aalisin ba sa pagkaka-block ang <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Alisin sa pagkaka-block"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"I-block ang mga tawag at text mula sa"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numero o email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Numero ng telepono"</string>
     <string name="block_button" msgid="8822290682524373357">"I-block"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Ang may-ari ng device lang ang makakakita at makakapamahala sa mga naka-block na numero."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab upang alisin sa pagkaka-block"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Pansamantalang naka-off ang pag-block"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Pagkatapos mong i-dial o i-text ang isang pang-emergency na numero, ino-off ang pag-block upang matiyak na maaaring makipag-ugnayan sa iyo ang mga serbisyong pang-emergency."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"I-enable muli ngayon"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Ginagamit ang personal na dialer upang tumawag"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1c3dc4d..0e1e813 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Varsayılan numara çevirici uygulamanız olarak <xliff:g id="CURRENT_APP">%2$s</xliff:g> yerine <xliff:g id="NEW_APP">%1$s</xliff:g> kullanılsın mı?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Varsayılan numara çevirici uygulamanız olarak <xliff:g id="NEW_APP">%s</xliff:g> kullanılsın mı?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Engellenen numaralar"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Bu listedeki numaralardan gelen çağrılar ve kısa mesajlar engelleniyor."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Engellenen numaralardan gelen çağrıları veya kısa mesajları almazsınız."</string>
     <string name="block_number" msgid="1101252256321306179">"Numara ekle"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> numaralı telefonun engellemesi kaldırılsın mı?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Engellemeyi kaldır"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Şu numaradan gelen çağrıları ve kısa mesajları engelle:"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Numara veya e-posta"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefon numarası"</string>
     <string name="block_button" msgid="8822290682524373357">"Engelle"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Yalnızca cihaz sahibi engellenen numaraları görüntüleyebilir ve yönetebilir."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Engellemeyi kaldırmak için hafifçe dokunun"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Engelleme geçici olarak kapalı"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Bir acil durum numarasını çevirmenizin veya acil durum numarasına kısa mesaj göndermenizin ardından acil durum hizmetlerinin size ulaşabilmesi için engelleme kapatılır."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Şimdi yeniden etkinleştir"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Telefon etmek için kişisel numara çeviriciyi kullanma"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1508452..53a5b50 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Зробити <xliff:g id="NEW_APP">%1$s</xliff:g> додатком для дзвінків за умовчанням замість додатка <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Зробити <xliff:g id="NEW_APP">%s</xliff:g> додатком для дзвінків за умовчанням?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Заблоковані номери"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Виклики та SMS із цих номерів блокуватимуться."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Ви не отримуватимете виклики й повідомлення із заблокованих номерів."</string>
     <string name="block_number" msgid="1101252256321306179">"Додати номер"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Розблокувати <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Розблокувати"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Заблокувати виклики та SMS із"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Номер чи електронна адреса"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Номер телефону"</string>
     <string name="block_button" msgid="8822290682524373357">"Заблокувати"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Лише власник пристрою може переглядати заблоковані номери та керувати ними."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Торкніться, щоб розблокувати"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Блокування тимчасово вимкнено"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Після набору або введення екстреного номеру блокування вимикається, щоб із вами могли зв’язатися представники екстрених служб."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Відновити"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Для дзвінків використовується особистий додаток набору номерів"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 18ee6ea..cfeab0c 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> کی بجائے <xliff:g id="NEW_APP">%1$s</xliff:g> کو بطور اپنی ڈیفالٹ ڈائلر ایپ استعمال کریں؟"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> کو بطور اپنی ڈیفالٹ ڈائلر ایپ استعمال کریں؟"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"مسدود کردہ نمبرز"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"اس فہرست پر موجود نمبرز سے کالز اور پیغامات مسدود ہیں۔"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"آپ مسدود کردہ نمبروں سے کالیں یا متنی پیغامات وصول نہیں کریں گے۔"</string>
     <string name="block_number" msgid="1101252256321306179">"ایک نمبر کا اضافہ کریں"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> غیر مسدود کریں؟"</string>
     <string name="unblock_button" msgid="3078048901972674170">"غیر مسدود کریں"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"ان کی کالز اور پیغامات مدسود کریں"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"نمبر یا ای میل"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"فون نمبر"</string>
     <string name="block_button" msgid="8822290682524373357">"مسدود کریں"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"صرف آلہ کا مالک مسدود کردہ نمبرز کو دیکھ سکتا ہے اور ان کا نظم کر سکتا ہے۔"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"غیر مسدود کرنے کا ٹیب"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"مسدود کرنا عارضی طور پر آف ہے"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"جب آپ کوئی ایمرجنسی نمبر ڈائل کرتے یا اسے متن بھیجتے ہیں تو انسداد کو آ‌ف کر دیا جاتا ہے تاکہ ہنگامی سروسز آپ سے رابطہ کر سکیں۔"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"اب دوبارہ فعال کریں"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"کال کرنے کیلئے ذاتی ڈائلر استعمال ہو رہا ہے"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 4f9fb0c..891a48f 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Raqam terish uchun birlamchi ilova sifatida <xliff:g id="CURRENT_APP">%2$s</xliff:g> o‘rniga <xliff:g id="NEW_APP">%1$s</xliff:g> ilovasi tanlansinmi?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"<xliff:g id="NEW_APP">%s</xliff:g> raqam terish uchun birlamchi ilova sifatida tanlansinmi?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Bloklangan raqamlar"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Bu ro‘yxatdagi raqamlardan keladigan qo‘ng‘iroqlar va SMS xabarlar bloklanadi."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Bloklangan telefon raqamlaridan qo‘ng‘iroq yoki matnli xabarlar qabul qilib bo‘lmaydi."</string>
     <string name="block_number" msgid="1101252256321306179">"Telefon raqamini qo‘shish"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> raqami blokdan chiqarilsinmi?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Blokdan chiqarish"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Bu raqamdan kelgan qo‘ng‘iroqlar va SMS xabarlar bloklansin"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Telefon raqami yoki e-pochta manzili"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefon raqami"</string>
     <string name="block_button" msgid="8822290682524373357">"Bloklash"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Faqat qurilma egasi bloklangan raqamlarni ko‘rishi va boshqarishi mumkin."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Blokdan chiqarish uchun bosing"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Telefon raqamini bloklash xususiyati vaqtinchalik o‘chirib qo‘yilgan"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Favqulodda chaqiruv raqamiga qo‘ng‘iroq qilganda yoki unga matnli xabar yuborganingizda, favqulodda holatlar xizmati xodimlari siz bilan bog‘lana olishlari uchun telefoningizda telefon raqamlarini bloklash xususiyati o‘chirib qo‘yiladi."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Qayta faollashtirish"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Qo‘ng‘iroq qilish uchun shaxsiy raqam tergichdan foydalanilmoqda"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0b99443..fc203e5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Sử dụng <xliff:g id="NEW_APP">%1$s</xliff:g> làm ứng dụng trình quay số mặc định của bạn thay vì <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Sử dụng <xliff:g id="NEW_APP">%s</xliff:g> làm ứng dụng trình quay số mặc định của bạn?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Số bị chặn"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Cuộc gọi và tin nhắn từ các số trên danh sách này bị chặn."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Bạn sẽ không nhận được cuộc gọi hoặc tin nhắn từ các số bị chặn."</string>
     <string name="block_number" msgid="1101252256321306179">"Thêm số điện thoại"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Bỏ chặn <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Bỏ chặn"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Chặn cuộc gọi và tin nhắn từ"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Số điện thoại hoặc email"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Số điện thoại"</string>
     <string name="block_button" msgid="8822290682524373357">"Chặn"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Chỉ chủ sở hữu thiết bị mới có thể xem và quản lý các số bị chặn."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Tab để bỏ chặn"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Chế độ chặn tạm thời tắt"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Sau khi bạn quay số hoặc gửi tin nhắn tới số khẩn cấp, chế độ chặn sẽ bị tắt để đảm bảo dịch vụ khẩn cấp có thể liên hệ với bạn."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Bật lại ngay bây giờ"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Sử dụng trình quay số cá nhân để gọi điện"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3172ce8..4c1d206 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -49,15 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"要使用<xliff:g id="NEW_APP">%1$s</xliff:g>（而非<xliff:g id="CURRENT_APP">%2$s</xliff:g>）作为您的默认拨号器应用吗？"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"要使用<xliff:g id="NEW_APP">%s</xliff:g>作为您的默认拨号器应用吗？"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"已屏蔽的号码"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"系统已屏蔽此列表中所列号码的来电和短信。"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"您不会收到来自被拦截号码的来电或短信。"</string>
     <string name="block_number" msgid="1101252256321306179">"添加电话号码"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"要取消屏蔽 <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> 吗？"</string>
     <string name="unblock_button" msgid="3078048901972674170">"取消屏蔽"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"屏蔽以下号码的来电和短信："</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"电话号码或电子邮件地址"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"电话号码"</string>
     <string name="block_button" msgid="8822290682524373357">"屏蔽"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"只有机主才能查看和管理已屏蔽的号码。"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"点按即可取消屏蔽"</string>
-    <!-- no translation found for toast_personal_call_msg (5115361633476779723) -->
-    <skip />
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"已暂时停用来电拦截功能"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"您拨打紧急服务电话或向其发送短信后，系统会停用来电拦截功能，以确保紧急服务人员能与您联系。"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"立即重新启用"</string>
+    <string name="toast_personal_call_msg" msgid="5115361633476779723">"使用个人拨号器拨打电话"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 8ce1473..c5fc002 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"使用 <xliff:g id="NEW_APP">%1$s</xliff:g> 取代 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 作為預設撥號器應用程式？"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 為預設撥號器應用程式？"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"已封鎖的號碼"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"系統已封鎖此清單中所有號碼的來電和短訊。"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"您不會收到來自封鎖號碼的電話或短訊。"</string>
     <string name="block_number" msgid="1101252256321306179">"新增號碼"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"要解除封鎖 <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> 嗎？"</string>
     <string name="unblock_button" msgid="3078048901972674170">"解除封鎖"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"封鎖下列號碼的來電和短訊："</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"號碼或電郵"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"電話號碼"</string>
     <string name="block_button" msgid="8822290682524373357">"封鎖"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"只有裝置擁有者可查看和管理已封鎖的號碼。"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"輕按即可解除封鎖"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"暫時關閉封鎖功能"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"在您撥打或發短訊至緊急號碼後，封鎖功能會停用，以確保緊急服務可與您聯絡。"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"立即重新啟用"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"使用個人撥號器撥打電話"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f5a88a9..c2a4999 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"要將 <xliff:g id="NEW_APP">%1$s</xliff:g> (而非 <xliff:g id="CURRENT_APP">%2$s</xliff:g>) 設為預設撥號應用程式嗎？"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"要將 <xliff:g id="NEW_APP">%s</xliff:g> 設為預設撥號應用程式嗎？"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"已封鎖的號碼"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"系統已將這份清單所列號碼的來電和簡訊封鎖。"</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"您不會收到已封鎖號碼的來電或簡訊。"</string>
     <string name="block_number" msgid="1101252256321306179">"新增號碼"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"要解除封鎖 <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> 嗎？"</string>
     <string name="unblock_button" msgid="3078048901972674170">"解除封鎖"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"封鎖以下號碼的來電和簡訊："</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"電話號碼或電子郵件地址"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"電話號碼"</string>
     <string name="block_button" msgid="8822290682524373357">"封鎖"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"只有裝置擁有者能夠查看及管理已封鎖的號碼。"</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"輕按即可解除封鎖"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"已暫時停用來電封鎖功能"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"當您撥打或傳送簡訊到緊急服務電話後，系統就會停用來電封鎖功能，以確保緊急服務人員能夠與您聯絡。"</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"立即重新啟用"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"使用個人撥號程式撥打電話"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dc53179..81e43d5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -49,14 +49,17 @@
     <string name="change_default_dialer_with_previous_app_set_text" msgid="3213396537499337949">"Sebenzisa i-<xliff:g id="NEW_APP">%1$s</xliff:g> esikhundleni se-<xliff:g id="CURRENT_APP">%2$s</xliff:g> njengohlelo lwakho lokusebenza oluzenzakalelayo lokokudayela?"</string>
     <string name="change_default_dialer_no_previous_app_set_text" msgid="7608426684114545221">"Sebenzisa i-<xliff:g id="NEW_APP">%s</xliff:g> njengohlelo lwakho lokusebenza oluzenzakalelayo lokokudayela?"</string>
     <string name="blocked_numbers" msgid="2751843139572970579">"Izinombolo ezivinjiwe"</string>
-    <string name="blocked_numbers_msg" msgid="8210089024274925462">"Amakholi nemibhalo evela kuzinombolo ezikulo luhlu kuvinjelwe."</string>
+    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Ngeke uthole amakholi noma imibhalo kusuka kuzinombolo ezivinjelwe."</string>
     <string name="block_number" msgid="1101252256321306179">"Engeza inombolo"</string>
     <string name="unblock_dialog_body" msgid="1614238499771862793">"Vulela i-<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>
     <string name="unblock_button" msgid="3078048901972674170">"Vulela"</string>
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Vimba amakholi nemibhalo kusukela ku-"</string>
-    <string name="add_blocked_number_hint" msgid="1601214698916175149">"Inombolo noma i-imeyili"</string>
+    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Inombolo yefoni"</string>
     <string name="block_button" msgid="8822290682524373357">"Vimba"</string>
     <string name="non_primary_user" msgid="5180129233352533459">"Umnikazi wedivayisi kuphela ongabuka aphinde aphathe izinombolo ezivinjelwe."</string>
     <string name="delete_icon_description" msgid="1828583824185681368">"Ithebhu lokuvulela"</string>
+    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Ukuvimble kuvaliwe okwesikhashana"</string>
+    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Ngemuva kokudayela noma ubhalele inombolo yesimo esiphuthumayo, ukuvimbela kuvaliwe ukuqinisekisa amasevisi esimo esiphuthumayo angakwazi ukuxhumana nawe."</string>
+    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Nika amandla manje"</string>
     <string name="toast_personal_call_msg" msgid="5115361633476779723">"Ukusebenzisa okokudayila komuntu siqu ukwenza ikholi"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 64db085..75b8352 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,4 +20,9 @@
     <color name="dialer_settings_actionbar_text_color">#ffffff</color>
     <color name="dialer_settings_actionbar_background_color">@color/theme_color</color>
     <color name="dialer_settings_color_dark">#0277bd</color>
+
+    <color name="blocked_numbers_divider_color">#e5e5e5</color>
+    <color name="blocked_numbers_butter_bar_color">#f5f5f5</color>
+    <color name="blocked_numbers_title_text_color">#ba000000</color>
+    <color name="blocked_numbers_secondary_text_color">#89000000</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f2b1f5f..be77220 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -26,5 +26,8 @@
     <dimen name="blocked_numbers_delete_icon_size">24dp</dimen>
     <dimen name="blocked_numbers_progress_bar_padding">100dp</dimen>
     <dimen name="blocked_numbers_font_size">16sp</dimen>
+    <dimen name="blocked_numbers_secondary_font_size">14sp</dimen>
     <dimen name="blocked_numbers_line_spacing">8sp</dimen>
+    <dimen name="blocked_numbers_secondary_line_spacing">6sp</dimen>
+    <dimen name="blocked_numbers_divider_stroke">1dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a85faf0..22e0adf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -119,7 +119,7 @@
     <!-- Blocked numbers -->
     <string name="blocked_numbers">Blocked numbers</string>
     <!-- Text shown at the beginning of the blocked numbers screen to explain what the screen is about. -->
-    <string name="blocked_numbers_msg">Calls and texts from numbers on this list are blocked.</string>
+    <string name="blocked_numbers_msg">You won\'t receive calls or texts from blocked numbers.</string>
     <!-- Button to add a blocked number. -->
     <string name="block_number">Add a number</string>
     <!-- Body of dialog to confirm unblocking a number. -->
@@ -129,7 +129,7 @@
     <!-- Body of dialog to block a number.  -->
     <string name="add_blocked_dialog_body">Block calls and texts from</string>
     <!-- Hint shown in the edit text box for adding a blocked number -->
-    <string name="add_blocked_number_hint">Number or email</string>
+    <string name="add_blocked_number_hint">Phone number</string>
     <!-- Button to block a number. -->
     <string name="block_button">Block</string>
     <!-- String shown to users unable to manage blocked numbers because they are not owners of the
@@ -137,6 +137,13 @@
     <string name="non_primary_user">Only the device owner can view and manage blocked numbers.</string>
     <!-- Description of icon to delete blocked number. -->
     <string name="delete_icon_description">Tab to unblock</string>
+    <!-- Title for butter bar shown when call blocking is disabled. -->
+    <string name="blocked_numbers_butter_bar_title">Blocking temporarily off</string>
+    <!-- Explanation for butter bar shown when call blocking is disabled. -->
+    <string name="blocked_numbers_butter_bar_body">After you dial or text an emergency number, blocking is turned off to ensure that emergency services can contact you.</string>
+    <!-- Button to re-enable blocking shown in butter bar shown when call blocking is disabled. -->
+    <string name="blocked_numbers_butter_bar_button">Re-enable now</string>
+
 
     <!-- DO NOT TRANSLATE. Label for test Subscription 0. -->
     <string name="test_account_0_label">Q Mobile</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a7eb2fd..29c5566 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -38,6 +38,7 @@
         <item name="android:colorPrimaryDark">@color/dialer_settings_color_dark</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="android:colorAccent">@color/theme_color</item>
     </style>
 
     <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.Material.ActionBar">
@@ -58,7 +59,7 @@
         <item name="android:src">@drawable/ic_more_vert_24dp</item>
     </style>
 
-    <style name="BlockedNumbersAddButton">
+    <style name="BlockedNumbersButton">
         <item name="android:textColor">@color/theme_color</item>
         <item name="android:textSize">@dimen/blocked_numbers_font_size</item>
         <item name="android:textAllCaps">true</item>
@@ -68,4 +69,14 @@
         <item name="android:textSize">@dimen/blocked_numbers_font_size</item>
         <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item>
     </style>
+
+    <style name="BlockedNumbersTitleText"  parent="BlockedNumbersText">
+        <item name="android:textColor">@color/blocked_numbers_title_text_color</item>
+    </style>
+
+    <style name="BlockedNumbersSecondaryText">
+        <item name="android:textColor">@color/blocked_numbers_secondary_text_color</item>
+        <item name="android:textSize">@dimen/blocked_numbers_secondary_font_size</item>
+        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item>
+    </style>
 </resources>
diff --git a/res/xml/activity_blocked_numbers.xml b/res/xml/activity_blocked_numbers.xml
index a79078b..681cf89 100644
--- a/res/xml/activity_blocked_numbers.xml
+++ b/res/xml/activity_blocked_numbers.xml
@@ -15,56 +15,75 @@
   ~ limitations under the License
   -->
 
-<FrameLayout
+<ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/blocked_numbers_large_padding"
-        android:paddingRight="@dimen/blocked_numbers_large_padding">
-
-    <TextView
-            android:id="@+id/non_primary_user"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/non_primary_user"
-            android:paddingTop="@dimen/blocked_numbers_large_padding"
-            style="@style/BlockedNumbersText"
-            android:visibility="gone" />
+        android:layout_height="match_parent"
+        android:fillViewport="true">
 
     <LinearLayout
-            android:id="@+id/manage_blocked_ui"
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/blocked_numbers_large_padding">
+            android:layout_height="match_parent">
 
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/blocked_numbers_msg"
-                android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
-                style="@style/BlockedNumbersText" />
+        <include
+                android:id="@+id/butter_bar"
+                layout="@xml/blocking_suppressed_butterbar" />
 
-        <TextView
-                android:id="@+id/add_blocked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/block_number"
-                android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
-                style="@style/BlockedNumbersAddButton" />
-
-        <ProgressBar
-                android:id="@+id/progress_bar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                android:layout_marginTop="@dimen/blocked_numbers_progress_bar_padding"
-                style="@android:style/Widget.ProgressBar.Large" />
-
-        <ListView
-                android:id="@android:id/list"
+        <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/blocked_numbers_large_padding"
+                android:paddingRight="@dimen/blocked_numbers_large_padding">
+
+            <TextView
+                    android:id="@+id/non_primary_user"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/non_primary_user"
+                    android:paddingTop="@dimen/blocked_numbers_large_padding"
+                    style="@style/BlockedNumbersTitleText"
+                    android:visibility="gone" />
+
+            <LinearLayout
+                    android:id="@+id/manage_blocked_ui"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/blocked_numbers_large_padding">
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/blocked_numbers_msg"
+                        android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
+                        style="@style/BlockedNumbersTitleText" />
+
+                <TextView
+                        android:id="@+id/add_blocked"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/block_number"
+                        android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
+                        style="@style/BlockedNumbersButton"
+                        android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+                <ProgressBar
+                        android:id="@+id/progress_bar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:indeterminate="true"
+                        android:layout_marginTop="@dimen/blocked_numbers_progress_bar_padding"
+                        style="@android:style/Widget.ProgressBar.Large" />
+
+                <ListView
+                        android:id="@android:id/list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:nestedScrollingEnabled="true"
+                        android:paddingBottom="@dimen/blocked_numbers_extra_large_padding" />
+            </LinearLayout>
+        </FrameLayout>
     </LinearLayout>
-</FrameLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/xml/add_blocked_number_dialog.xml b/res/xml/add_blocked_number_dialog.xml
index b71f78f..c1a2d28 100644
--- a/res/xml/add_blocked_number_dialog.xml
+++ b/res/xml/add_blocked_number_dialog.xml
@@ -21,9 +21,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:paddingLeft="@dimen/blocked_numbers_extra_large_padding"
-        android:paddingRight="@dimen/blocked_numbers_extra_large_padding"
-        android:focusable="true"
-        android:focusableInTouchMode="true">
+        android:paddingRight="@dimen/blocked_numbers_extra_large_padding">
     <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -38,5 +36,5 @@
             android:paddingTop="@dimen/blocked_numbers_large_padding"
             android:paddingBottom="@dimen/blocked_numbers_large_padding"
             android:hint="@string/add_blocked_number_hint"
-            android:inputType="text" />
+            android:inputType="phone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/xml/blocking_suppressed_butterbar.xml b/res/xml/blocking_suppressed_butterbar.xml
new file mode 100644
index 0000000..cd4579e
--- /dev/null
+++ b/res/xml/blocking_suppressed_butterbar.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+
+ <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/blocked_numbers_butter_bar_color">
+
+    <ImageView
+            android:id="@+id/icon"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:paddingTop="@dimen/blocked_numbers_large_padding"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:paddingLeft="@dimen/blocked_numbers_large_padding"
+            android:src="@drawable/ic_status_blocked_orange_40dp"/>
+
+    <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/icon"
+            android:paddingTop="@dimen/blocked_numbers_large_padding"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:text="@string/blocked_numbers_butter_bar_title"
+            style="@style/BlockedNumbersTitleText" />
+
+    <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/icon"
+            android:layout_below="@id/title"
+            android:paddingTop="@dimen/blocked_numbers_large_padding"
+            android:paddingBottom="@dimen/blocked_numbers_large_padding"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:text="@string/blocked_numbers_butter_bar_body"
+            style="@style/BlockedNumbersSecondaryText" />
+
+    <TextView
+            android:id="@+id/reenable_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/icon"
+            android:layout_below="@id/description"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:text="@string/blocked_numbers_butter_bar_button"
+            style="@style/BlockedNumbersButton"
+            android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+    <View
+          xmlns:tools="http://schemas.android.com/tools"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/blocked_numbers_divider_stroke"
+          android:layout_below="@id/reenable_button"
+          android:layout_marginTop="@dimen/blocked_numbers_large_padding"
+          android:background="@color/blocked_numbers_divider_color" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/com/android/server/telecom/AsyncRingtonePlayer.java b/src/com/android/server/telecom/AsyncRingtonePlayer.java
index f597cf1..bb2e9cd 100644
--- a/src/com/android/server/telecom/AsyncRingtonePlayer.java
+++ b/src/com/android/server/telecom/AsyncRingtonePlayer.java
@@ -17,11 +17,13 @@
 package com.android.server.telecom;
 
 import android.media.Ringtone;
+import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.os.SomeArgs;
 import com.android.internal.util.Preconditions;
 
 /**
@@ -45,13 +47,12 @@
     private Ringtone mRingtone;
 
     /** Plays the ringtone. */
-    public void play(Ringtone ringtone) {
+    public void play(RingtoneFactory factory, Uri ringtoneUri) {
         Log.d(this, "Posting play.");
-        if (ringtone == null) {
-            Log.i(this, "null (silence -- not playing anything)");
-            return;
-        }
-        postMessage(EVENT_PLAY, true /* shouldCreateHandler */, ringtone);
+        SomeArgs args = SomeArgs.obtain();
+        args.arg1 = factory;
+        args.arg2 = ringtoneUri;
+        postMessage(EVENT_PLAY, true /* shouldCreateHandler */, args);
     }
 
     /** Stops playing the ringtone. */
@@ -67,7 +68,7 @@
      * @param messageCode The message to post.
      * @param shouldCreateHandler True when a handler should be created to handle this message.
      */
-    private void postMessage(int messageCode, boolean shouldCreateHandler, Ringtone ringtone) {
+    private void postMessage(int messageCode, boolean shouldCreateHandler, SomeArgs args) {
         synchronized(this) {
             if (mHandler == null && shouldCreateHandler) {
                 mHandler = getNewHandler();
@@ -76,7 +77,7 @@
             if (mHandler == null) {
                 Log.d(this, "Message %d skipped because there is no handler.", messageCode);
             } else {
-                mHandler.obtainMessage(messageCode, ringtone).sendToTarget();
+                mHandler.obtainMessage(messageCode, args).sendToTarget();
             }
         }
     }
@@ -95,7 +96,7 @@
             public void handleMessage(Message msg) {
                 switch(msg.what) {
                     case EVENT_PLAY:
-                        handlePlay((Ringtone) msg.obj);
+                        handlePlay((SomeArgs) msg.obj);
                         break;
                     case EVENT_REPEAT:
                         handleRepeat();
@@ -111,7 +112,10 @@
     /**
      * Starts the actual playback of the ringtone. Executes on ringtone-thread.
      */
-    private void handlePlay(Ringtone ringtone) {
+    private void handlePlay(SomeArgs args) {
+        RingtoneFactory factory = (RingtoneFactory) args.arg1;
+        Uri ringtoneUri = (Uri) args.arg2;
+        args.recycle();
         // don't bother with any of this if there is an EVENT_STOP waiting.
         if (mHandler.hasMessages(EVENT_STOP)) {
             return;
@@ -121,7 +125,12 @@
         Log.i(this, "Play ringtone.");
 
         if (mRingtone == null) {
-            mRingtone = ringtone;
+            mRingtone = factory.getRingtone(ringtoneUri);
+            if (mRingtone == null) {
+                Log.event(null, Log.Events.ERROR_LOG, "Failed to get ringtone from factory. " +
+                        "Skipping ringing. Uri was: " + ringtoneUri.toSafeString());
+                return;
+            }
         }
 
         handleRepeat();
diff --git a/src/com/android/server/telecom/BluetoothAdapterProxy.java b/src/com/android/server/telecom/BluetoothAdapterProxy.java
new file mode 100644
index 0000000..addef2f
--- /dev/null
+++ b/src/com/android/server/telecom/BluetoothAdapterProxy.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 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
+ */
+
+package com.android.server.telecom;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+
+/**
+ * Proxy class used so that BluetoothAdapter can be mocked for testing.
+ */
+public class BluetoothAdapterProxy {
+    private BluetoothAdapter mBluetoothAdapter;
+
+    public BluetoothAdapterProxy() {
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    public boolean getProfileProxy(Context context, BluetoothProfile.ServiceListener listener,
+            int profile) {
+        return mBluetoothAdapter.getProfileProxy(context, listener, profile);
+    }
+}
diff --git a/src/com/android/server/telecom/BluetoothHeadsetProxy.java b/src/com/android/server/telecom/BluetoothHeadsetProxy.java
index 48c60a1..07cc626 100644
--- a/src/com/android/server/telecom/BluetoothHeadsetProxy.java
+++ b/src/com/android/server/telecom/BluetoothHeadsetProxy.java
@@ -16,8 +16,11 @@
 
 package com.android.server.telecom;
 
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
 
+import java.util.List;
+
 /**
  * A proxy class that facilitates testing of the BluetoothPhoneServiceImpl class.
  *
@@ -44,4 +47,24 @@
 
         mBluetoothHeadset.phoneStateChanged(numActive, numHeld, callState, number, type);
     }
+
+    public List<BluetoothDevice> getConnectedDevices() {
+        return mBluetoothHeadset.getConnectedDevices();
+    }
+
+    public int getConnectionState(BluetoothDevice device) {
+        return mBluetoothHeadset.getConnectionState(device);
+    }
+
+    public boolean isAudioConnected(BluetoothDevice device) {
+        return mBluetoothHeadset.isAudioConnected(device);
+    }
+
+    public boolean connectAudio() {
+        return mBluetoothHeadset.connectAudio();
+    }
+
+    public boolean disconnectAudio() {
+        return mBluetoothHeadset.disconnectAudio();
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/server/telecom/BluetoothManager.java b/src/com/android/server/telecom/BluetoothManager.java
index 8dd5a7b..f0dd690 100644
--- a/src/com/android/server/telecom/BluetoothManager.java
+++ b/src/com/android/server/telecom/BluetoothManager.java
@@ -32,14 +32,21 @@
 import com.android.internal.util.IndentingPrintWriter;
 
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * Listens to and caches bluetooth headset state.  Used By the CallAudioManager for maintaining
  * overall audio state. Also provides method for connecting the bluetooth headset to the phone call.
  */
 public class BluetoothManager {
+    public static final int BLUETOOTH_UNINITIALIZED = 0;
+    public static final int BLUETOOTH_DISCONNECTED = 1;
+    public static final int BLUETOOTH_DEVICE_CONNECTED = 2;
+    public static final int BLUETOOTH_AUDIO_PENDING = 3;
+    public static final int BLUETOOTH_AUDIO_CONNECTED = 4;
+
     public interface BluetoothStateListener {
-        void onBluetoothStateChange(BluetoothManager bluetoothManager);
+        void onBluetoothStateChange(int oldState, int newState);
     }
 
     private final BluetoothProfile.ServiceListener mBluetoothProfileServiceListener =
@@ -48,9 +55,14 @@
                 public void onServiceConnected(int profile, BluetoothProfile proxy) {
                     Log.startSession("BMSL.oSC");
                     try {
-                        mBluetoothHeadset = (BluetoothHeadset) proxy;
-                        Log.v(this, "- Got BluetoothHeadset: " + mBluetoothHeadset);
-                        updateBluetoothState();
+                        if (profile == BluetoothProfile.HEADSET) {
+                            mBluetoothHeadset = new BluetoothHeadsetProxy((BluetoothHeadset) proxy);
+                            Log.v(this, "- Got BluetoothHeadset: " + mBluetoothHeadset);
+                        } else {
+                            Log.w(this, "Connected to non-headset bluetooth service. Not changing" +
+                                    " bluetooth headset.");
+                        }
+                        updateListenerOfBluetoothState(true);
                     } finally {
                         Log.endSession();
                     }
@@ -62,7 +74,7 @@
                     try {
                         mBluetoothHeadset = null;
                         Log.v(this, "Lost BluetoothHeadset: " + mBluetoothHeadset);
-                        updateBluetoothState();
+                        updateListenerOfBluetoothState(false);
                     } finally {
                         Log.endSession();
                     }
@@ -84,14 +96,16 @@
                             BluetoothHeadset.STATE_DISCONNECTED);
                     Log.d(this, "mReceiver: HEADSET_STATE_CHANGED_ACTION");
                     Log.d(this, "==> new state: %s ", bluetoothHeadsetState);
-                    updateBluetoothState();
+                    updateListenerOfBluetoothState(
+                            bluetoothHeadsetState == BluetoothHeadset.STATE_CONNECTING);
                 } else if (action.equals(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED)) {
                     int bluetoothHeadsetAudioState =
                             intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
                                     BluetoothHeadset.STATE_AUDIO_DISCONNECTED);
                     Log.d(this, "mReceiver: HEADSET_AUDIO_STATE_CHANGED_ACTION");
                     Log.d(this, "==> new state: %s", bluetoothHeadsetAudioState);
-                    updateBluetoothState();
+                    updateListenerOfBluetoothState(
+                            bluetoothHeadsetAudioState == BluetoothHeadset.STATE_AUDIO_CONNECTING);
                 }
             } finally {
                 Log.endSession();
@@ -101,11 +115,10 @@
 
     private final Handler mHandler = new Handler(Looper.getMainLooper());
 
-    private final BluetoothAdapter mBluetoothAdapter;
+    private final BluetoothAdapterProxy mBluetoothAdapter;
     private BluetoothStateListener mBluetoothStateListener;
 
-    private BluetoothHeadset mBluetoothHeadset;
-    private boolean mBluetoothConnectionPending = false;
+    private BluetoothHeadsetProxy mBluetoothHeadset;
     private long mBluetoothConnectionRequestTime;
     private final Runnable mBluetoothConnectionTimeout = new Runnable("BM.cBA") {
         @Override
@@ -114,15 +127,14 @@
                 Log.v(this, "Bluetooth audio inexplicably disconnected within 5 seconds of " +
                         "connection. Updating UI.");
             }
-            mBluetoothConnectionPending = false;
-            updateBluetoothState();
+            updateListenerOfBluetoothState(false);
         }
     };
     private final Context mContext;
+    private int mBluetoothState = BLUETOOTH_UNINITIALIZED;
 
-
-    public BluetoothManager(Context context) {
-        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    public BluetoothManager(Context context, BluetoothAdapterProxy bluetoothAdapterProxy) {
+        mBluetoothAdapter = bluetoothAdapterProxy;
         mContext = context;
 
         if (mBluetoothAdapter != null) {
@@ -200,7 +212,8 @@
     /**
      * @return true if a BT Headset is available, and its audio is currently connected.
      */
-    boolean isBluetoothAudioConnected() {
+    @VisibleForTesting
+    public boolean isBluetoothAudioConnected() {
         if (mBluetoothHeadset == null) {
             Log.v(this, "isBluetoothAudioConnected: ==> FALSE (null mBluetoothHeadset)");
             return false;
@@ -241,7 +254,7 @@
         // If we issued a connectAudio() call "recently enough", even
         // if BT isn't actually connected yet, let's still pretend BT is
         // on.  This makes the onscreen indication more responsive.
-        if (mBluetoothConnectionPending) {
+        if (isBluetoothAudioPending()) {
             long timeSinceRequest =
                     SystemClock.elapsedRealtime() - mBluetoothConnectionRequestTime;
             Log.v(this, "isBluetoothAudioConnectedOrPending: ==> TRUE (requested "
@@ -253,11 +266,28 @@
         return false;
     }
 
+    private boolean isBluetoothAudioPending() {
+        return mBluetoothState == BLUETOOTH_AUDIO_PENDING;
+    }
+
     /**
      * Notified audio manager of a change to the bluetooth state.
      */
-    void updateBluetoothState() {
-        mBluetoothStateListener.onBluetoothStateChange(this);
+    private void updateListenerOfBluetoothState(boolean canBePending) {
+        int newState;
+        if (isBluetoothAudioConnected()) {
+            newState = BLUETOOTH_AUDIO_CONNECTED;
+        } else if (canBePending && isBluetoothAudioPending()) {
+            newState = BLUETOOTH_AUDIO_PENDING;
+        } else if (isBluetoothAvailable()) {
+            newState = BLUETOOTH_DEVICE_CONNECTED;
+        } else {
+            newState = BLUETOOTH_DISCONNECTED;
+        }
+        if (mBluetoothState != newState) {
+            mBluetoothStateListener.onBluetoothStateChange(mBluetoothState, newState);
+            mBluetoothState = newState;
+        }
     }
 
     @VisibleForTesting
@@ -269,10 +299,8 @@
 
         // Watch out: The bluetooth connection doesn't happen instantly;
         // the connectAudio() call returns instantly but does its real
-        // work in another thread.  The mBluetoothConnectionPending flag
-        // is just a little trickery to ensure that the onscreen UI updates
-        // instantly. (See isBluetoothAudioConnectedOrPending() above.)
-        mBluetoothConnectionPending = true;
+        // work in another thread.
+        mBluetoothState = BLUETOOTH_AUDIO_PENDING;
         mBluetoothConnectionRequestTime = SystemClock.elapsedRealtime();
         mHandler.removeCallbacks(mBluetoothConnectionTimeout.getRunnableToCancel());
         mBluetoothConnectionTimeout.cancel();
@@ -286,11 +314,13 @@
     public void disconnectBluetoothAudio() {
         Log.v(this, "disconnectBluetoothAudio()...");
         if (mBluetoothHeadset != null) {
+            mBluetoothState = BLUETOOTH_DEVICE_CONNECTED;
             mBluetoothHeadset.disconnectAudio();
+        } else {
+            mBluetoothState = BLUETOOTH_DISCONNECTED;
         }
         mHandler.removeCallbacks(mBluetoothConnectionTimeout.getRunnableToCancel());
         mBluetoothConnectionTimeout.cancel();
-        mBluetoothConnectionPending = false;
     }
 
     /**
@@ -322,4 +352,22 @@
             pw.println("mBluetoothAdapter is null; device is not BT capable");
         }
     }
+
+    /**
+     * Set the bluetooth headset proxy for testing purposes.
+     * @param bluetoothHeadsetProxy
+     */
+    @VisibleForTesting
+    public void setBluetoothHeadsetForTesting(BluetoothHeadsetProxy bluetoothHeadsetProxy) {
+        mBluetoothHeadset = bluetoothHeadsetProxy;
+    }
+
+    /**
+     * Set mBluetoothState for testing.
+     * @param state
+     */
+    @VisibleForTesting
+    public void setInternalBluetoothState(int state) {
+        mBluetoothState = state;
+    }
 }
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 62d002f..2a56422 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -104,6 +104,7 @@
         void onPhoneAccountChanged(Call call);
         void onConferenceableCallsChanged(Call call);
         boolean onCanceledViaNewOutgoingCallBroadcast(Call call);
+        void onHoldToneRequested(Call call);
     }
 
     public abstract static class ListenerBase implements Listener {
@@ -161,6 +162,9 @@
         public boolean onCanceledViaNewOutgoingCallBroadcast(Call call) {
             return false;
         }
+
+        @Override
+        public void onHoldToneRequested(Call call) {}
     }
 
     private final OnQueryCompleteListener mCallerInfoQueryListener =
@@ -365,6 +369,14 @@
     // Set to true once the NewOutgoingCallIntentBroadcast comes back and is processed.
     private boolean mIsNewOutgoingCallIntentBroadcastDone = false;
 
+
+    /**
+     * Indicates whether the call is remotely held.  A call is considered remotely held when
+     * {@link #onConnectionEvent(String)} receives the {@link Connection#EVENT_ON_HOLD_TONE_START}
+     * event.
+     */
+    private boolean mIsRemotelyHeld = false;
+
     /**
      * Persists the specified parameters and initializes the new instance.
      *
@@ -1922,4 +1934,36 @@
     public void setNewOutgoingCallIntentBroadcastIsDone() {
         mIsNewOutgoingCallIntentBroadcastDone = true;
     }
+
+    /**
+     * Determines if the call has been held by the remote party.
+     *
+     * @return {@code true} if the call is remotely held, {@code false} otherwise.
+     */
+    public boolean isRemotelyHeld() {
+        return mIsRemotelyHeld;
+    }
+
+    /**
+     * Handles Connection events received from a {@link ConnectionService}.
+     *
+     * @param event The event.
+     */
+    public void onConnectionEvent(String event) {
+        if (Connection.EVENT_ON_HOLD_TONE_START.equals(event)) {
+            mIsRemotelyHeld = true;
+            Log.event(this, Log.Events.REMOTELY_HELD);
+            // Inform listeners of the fact that a call hold tone was received.  This will trigger
+            // the CallAudioManager to play a tone via the InCallTonePlayer.
+            for (Listener l : mListeners) {
+                l.onHoldToneRequested(this);
+            }
+        } else if (Connection.EVENT_ON_HOLD_TONE_END.equals(event)) {
+            mIsRemotelyHeld = false;
+            Log.event(this, Log.Events.REMOTELY_UNHELD);
+            for (Listener l : mListeners) {
+                l.onHoldToneRequested(this);
+            }
+        }
+    }
 }
diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java
index 1a5cc7b..97f8bc8 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -55,6 +55,7 @@
 
     private Call mForegroundCall;
     private boolean mIsTonePlaying = false;
+    private InCallTonePlayer mHoldTonePlayer;
 
     public CallAudioManager(CallAudioRouteStateMachine callAudioRouteStateMachine,
             CallsManager callsManager,
@@ -213,6 +214,19 @@
         }
     }
 
+    /**
+     * Play or stop a call hold tone for a call.  Triggered via
+     * {@link Connection#sendConnectionEvent(String)} when the
+     * {@link Connection#EVENT_ON_HOLD_TONE_START} event or
+     * {@link Connection#EVENT_ON_HOLD_TONE_STOP} event is passed through to the
+     *
+     * @param call The call which requested the hold tone.
+     */
+    @Override
+    public void onHoldToneRequested(Call call) {
+        maybePlayHoldTone();
+    }
+
     @Override
     public void onIsVoipAudioModeChanged(Call call) {
         if (call != mForegroundCall) {
@@ -268,6 +282,10 @@
         return mCallAudioRouteStateMachine.getCurrentCallAudioState();
     }
 
+    public Call getPossiblyHeldForegroundCall() {
+        return mForegroundCall;
+    }
+
     public Call getForegroundCall() {
         if (mForegroundCall != null && mForegroundCall.getState() != CallState.ON_HOLD) {
             return mForegroundCall;
@@ -303,23 +321,23 @@
         switch (route) {
             case CallAudioState.ROUTE_BLUETOOTH:
                 mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                        CallAudioRouteStateMachine.SWITCH_BLUETOOTH);
+                        CallAudioRouteStateMachine.USER_SWITCH_BLUETOOTH);
                 return;
             case CallAudioState.ROUTE_SPEAKER:
                 mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                        CallAudioRouteStateMachine.SWITCH_SPEAKER);
+                        CallAudioRouteStateMachine.USER_SWITCH_SPEAKER);
                 return;
             case CallAudioState.ROUTE_WIRED_HEADSET:
                 mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                        CallAudioRouteStateMachine.SWITCH_HEADSET);
+                        CallAudioRouteStateMachine.USER_SWITCH_HEADSET);
                 return;
             case CallAudioState.ROUTE_EARPIECE:
                 mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                        CallAudioRouteStateMachine.SWITCH_EARPIECE);
+                        CallAudioRouteStateMachine.USER_SWITCH_EARPIECE);
                 return;
             case CallAudioState.ROUTE_WIRED_OR_EARPIECE:
                 mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                        CallAudioRouteStateMachine.SWITCH_BASELINE_ROUTE);
+                        CallAudioRouteStateMachine.USER_SWITCH_BASELINE_ROUTE);
                 return;
             default:
                 Log.wtf(this, "Invalid route specified: %d", route);
@@ -486,6 +504,7 @@
 
         if (mForegroundCall != oldForegroundCall) {
             mDtmfLocalTonePlayer.onForegroundCallChanged(oldForegroundCall, mForegroundCall);
+            maybePlayHoldTone();
         }
     }
 
@@ -554,6 +573,51 @@
         mRingbackPlayer.stopRingbackForCall(call);
     }
 
+    /**
+     * Determines if a hold tone should be played and then starts or stops it accordingly.
+     */
+    private void maybePlayHoldTone() {
+        if (shouldPlayHoldTone()) {
+            if (mHoldTonePlayer == null) {
+                mHoldTonePlayer = mPlayerFactory.createPlayer(InCallTonePlayer.TONE_CALL_WAITING);
+                mHoldTonePlayer.start();
+            }
+        } else {
+            if (mHoldTonePlayer != null) {
+                mHoldTonePlayer.stopTone();
+                mHoldTonePlayer = null;
+            }
+        }
+    }
+
+    /**
+     * Determines if a hold tone should be played.
+     * A hold tone should be played only if foreground call is equals with call which is
+     * remotely held.
+     *
+     * @return {@code true} if the the hold tone should be played, {@code false} otherwise.
+     */
+    private boolean shouldPlayHoldTone() {
+        Call foregroundCall = getForegroundCall();
+        // If there is no foreground call, no hold tone should play.
+        if (foregroundCall == null) {
+            return false;
+        }
+
+        // If another call is ringing, no hold tone should play.
+        if (mCallsManager.hasRingingCall()) {
+            return false;
+        }
+
+        // If the foreground call isn't active, no hold tone should play. This might happen, for
+        // example, if the user puts a remotely held call on hold itself.
+        if (!foregroundCall.isActive()) {
+            return false;
+        }
+
+        return foregroundCall.isRemotelyHeld();
+    }
+
     private void dumpCallsInCollection(IndentingPrintWriter pw, Collection<Call> calls) {
         for (Call call : calls) {
             if (call != null) pw.println(call.getId());
diff --git a/src/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java b/src/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
index 45e5afa..9b62443 100644
--- a/src/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
+++ b/src/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
@@ -20,8 +20,9 @@
  * A class that acts as a listener to things that could change call audio routing, namely
  * bluetooth status, wired headset status, and dock status.
  */
-public class CallAudioRoutePeripheralAdapter implements BluetoothManager.BluetoothStateListener,
-        WiredHeadsetManager.Listener, DockManager.Listener {
+public class CallAudioRoutePeripheralAdapter implements WiredHeadsetManager.Listener,
+        DockManager.Listener, BluetoothManager.BluetoothStateListener {
+
     private final CallAudioRouteStateMachine mCallAudioRouteStateMachine;
     private final BluetoothManager mBluetoothManager;
 
@@ -38,21 +39,50 @@
         dockManager.addListener(this);
     }
 
-    @Override
-    public void onBluetoothStateChange(BluetoothManager bluetoothManager) {
-        if (bluetoothManager.isBluetoothAvailable()) {
-            mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                    CallAudioRouteStateMachine.CONNECT_BLUETOOTH);
-        } else {
-            mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
-                    CallAudioRouteStateMachine.DISCONNECT_BLUETOOTH);
-        }
-    }
-
     public boolean isBluetoothAudioOn() {
         return mBluetoothManager.isBluetoothAudioConnected();
     }
 
+    @Override
+    public void onBluetoothStateChange(int oldState, int newState) {
+        switch (oldState) {
+            case BluetoothManager.BLUETOOTH_DISCONNECTED:
+            case BluetoothManager.BLUETOOTH_UNINITIALIZED:
+                switch (newState) {
+                    case BluetoothManager.BLUETOOTH_DEVICE_CONNECTED:
+                    case BluetoothManager.BLUETOOTH_AUDIO_CONNECTED:
+                        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
+                                CallAudioRouteStateMachine.CONNECT_BLUETOOTH);
+                        break;
+                }
+                break;
+            case BluetoothManager.BLUETOOTH_DEVICE_CONNECTED:
+                switch (newState) {
+                    case BluetoothManager.BLUETOOTH_DISCONNECTED:
+                        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
+                                CallAudioRouteStateMachine.DISCONNECT_BLUETOOTH);
+                        break;
+                    case BluetoothManager.BLUETOOTH_AUDIO_CONNECTED:
+                        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
+                                CallAudioRouteStateMachine.SWITCH_BLUETOOTH);
+                        break;
+                }
+                break;
+            case BluetoothManager.BLUETOOTH_AUDIO_CONNECTED:
+            case BluetoothManager.BLUETOOTH_AUDIO_PENDING:
+                switch (newState) {
+                    case BluetoothManager.BLUETOOTH_DISCONNECTED:
+                        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
+                                CallAudioRouteStateMachine.DISCONNECT_BLUETOOTH);
+                        break;
+                    case BluetoothManager.BLUETOOTH_DEVICE_CONNECTED:
+                        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(
+                                CallAudioRouteStateMachine.BT_AUDIO_DISCONNECT);
+                        break;
+                }
+                break;
+        }
+    }
     /**
       * Updates the audio route when the headset plugged in state changes. For example, if audio is
       * being routed over speakerphone and a headset is plugged in then switch to wired headset.
diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
index 7bb213a..a3d03b0 100644
--- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
@@ -84,6 +84,13 @@
     public static final int SWITCH_SPEAKER = 1004;
     // Wired headset, earpiece, or speakerphone, in that order of precedence.
     public static final int SWITCH_BASELINE_ROUTE = 1005;
+    public static final int BT_AUDIO_DISCONNECT = 1006;
+
+    public static final int USER_SWITCH_EARPIECE = 1101;
+    public static final int USER_SWITCH_BLUETOOTH = 1102;
+    public static final int USER_SWITCH_HEADSET = 1103;
+    public static final int USER_SWITCH_SPEAKER = 1104;
+    public static final int USER_SWITCH_BASELINE_ROUTE = 1105;
 
     public static final int REINITIALIZE = 2001;
 
@@ -113,6 +120,13 @@
         put(SWITCH_HEADSET, "SWITCH_HEADSET");
         put(SWITCH_SPEAKER, "SWITCH_SPEAKER");
         put(SWITCH_BASELINE_ROUTE, "SWITCH_BASELINE_ROUTE");
+        put(BT_AUDIO_DISCONNECT, "BT_AUDIO_DISCONNECT");
+
+        put(USER_SWITCH_EARPIECE, "USER_SWITCH_EARPIECE");
+        put(USER_SWITCH_BLUETOOTH, "USER_SWITCH_BLUETOOTH");
+        put(USER_SWITCH_HEADSET, "USER_SWITCH_HEADSET");
+        put(USER_SWITCH_SPEAKER, "USER_SWITCH_SPEAKER");
+        put(USER_SWITCH_BASELINE_ROUTE, "USER_SWITCH_BASELINE_ROUTE");
 
         put(REINITIALIZE, "REINITIALIZE");
 
@@ -175,17 +189,10 @@
                     mAvailableRoutes |= ROUTE_WIRED_HEADSET;
                     return NOT_HANDLED;
                 case CONNECT_BLUETOOTH:
-                    // This case is here because the bluetooth manager sends out a lot of spurious
-                    // state changes, and no layers above this one can tell which are actual changes
-                    // in connection/disconnection status. This filters it out.
-                    if ((mAvailableRoutes & ROUTE_BLUETOOTH) != 0) {
-                        return HANDLED; // Do nothing if we already have bluetooth as enabled.
-                    } else {
-                        Log.event(mCallsManager.getForegroundCall(), Log.Events.AUDIO_ROUTE,
-                                "Bluetooth connected");
-                        mAvailableRoutes |= ROUTE_BLUETOOTH;
-                        return NOT_HANDLED;
-                    }
+                    Log.event(mCallsManager.getForegroundCall(), Log.Events.AUDIO_ROUTE,
+                            "Bluetooth connected");
+                    mAvailableRoutes |= ROUTE_BLUETOOTH;
+                    return NOT_HANDLED;
                 case DISCONNECT_WIRED_HEADSET:
                     Log.event(mCallsManager.getForegroundCall(), Log.Events.AUDIO_ROUTE,
                             "Wired headset disconnected");
@@ -195,33 +202,22 @@
                     }
                     return NOT_HANDLED;
                 case DISCONNECT_BLUETOOTH:
-                    if ((mAvailableRoutes & ROUTE_BLUETOOTH) == 0) {
-                        return HANDLED;
-                    } else {
-                        Log.event(mCallsManager.getForegroundCall(), Log.Events.AUDIO_ROUTE,
-                                "Bluetooth disconnected");
-                        mAvailableRoutes &= ~ROUTE_BLUETOOTH;
-                        return NOT_HANDLED;
-                    }
+                    Log.event(mCallsManager.getForegroundCall(), Log.Events.AUDIO_ROUTE,
+                            "Bluetooth disconnected");
+                    mAvailableRoutes &= ~ROUTE_BLUETOOTH;
+                    return NOT_HANDLED;
                 case SWITCH_BASELINE_ROUTE:
-                    if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
-                        sendInternalMessage(SWITCH_EARPIECE);
-                    } else if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
-                        sendInternalMessage(SWITCH_HEADSET);
-                    } else if (!mDoesDeviceSupportEarpieceRoute) {
-                        sendInternalMessage(SWITCH_SPEAKER);
-                    } else {
-                        Log.e(this, new IllegalStateException(),
-                                "Neither headset nor earpiece are available, but there is an " +
-                                        "earpiece on the device. Defaulting to earpiece.");
-                        sendInternalMessage(SWITCH_EARPIECE);
-                    }
+                    sendInternalMessage(calculateBaselineRouteMessage(false));
+                    return HANDLED;
+                case USER_SWITCH_BASELINE_ROUTE:
+                    sendInternalMessage(calculateBaselineRouteMessage(true));
                     return HANDLED;
                 case REINITIALIZE:
                     CallAudioState initState = getInitialAudioState();
                     mAvailableRoutes = initState.getSupportedRouteMask();
                     mIsMuted = initState.isMuted();
                     mWasOnSpeaker = initState.getRoute() == ROUTE_SPEAKER;
+                    mHasUserExplicitlyLeftBluetooth = false;
                     transitionTo(mRouteCodeToQuiescentState.get(initState.getRoute()));
                     return HANDLED;
                 default:
@@ -269,9 +265,11 @@
             }
             switch (msg.what) {
                 case SWITCH_EARPIECE:
+                case USER_SWITCH_EARPIECE:
                     // Nothing to do here
                     return HANDLED;
                 case SWITCH_BLUETOOTH:
+                case USER_SWITCH_BLUETOOTH:
                     if ((mAvailableRoutes & ROUTE_BLUETOOTH) != 0) {
                         transitionTo(mActiveBluetoothRoute);
                     } else {
@@ -279,6 +277,7 @@
                     }
                     return HANDLED;
                 case SWITCH_HEADSET:
+                case USER_SWITCH_HEADSET:
                     if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
                         transitionTo(mActiveHeadsetRoute);
                     } else {
@@ -286,6 +285,7 @@
                     }
                     return HANDLED;
                 case SWITCH_SPEAKER:
+                case USER_SWITCH_SPEAKER:
                     transitionTo(mActiveSpeakerRoute);
                     return HANDLED;
                 case SWITCH_FOCUS:
@@ -313,6 +313,7 @@
         @Override
         public void enter() {
             super.enter();
+            mHasUserExplicitlyLeftBluetooth = false;
             updateInternalCallAudioState();
         }
 
@@ -369,7 +370,13 @@
                     sendInternalMessage(SWITCH_HEADSET);
                     return HANDLED;
                 case CONNECT_BLUETOOTH:
-                    sendInternalMessage(SWITCH_BLUETOOTH);
+                    if (!mHasUserExplicitlyLeftBluetooth) {
+                        sendInternalMessage(SWITCH_BLUETOOTH);
+                    } else {
+                        Log.i(this, "Not switching to BT route from earpiece because user has " +
+                                "explicitly disconnected.");
+                        updateSystemAudioState();
+                    }
                     return HANDLED;
                 case DISCONNECT_BLUETOOTH:
                     updateSystemAudioState();
@@ -381,6 +388,9 @@
                             "earpiece");
                     updateSystemAudioState();
                     return HANDLED;
+                case BT_AUDIO_DISCONNECT:
+                    // This may be sent as a confirmation by the BT stack after switch off BT.
+                    return HANDLED;
                 case CONNECT_DOCK:
                     sendInternalMessage(SWITCH_SPEAKER);
                     return HANDLED;
@@ -428,6 +438,7 @@
             }
             switch (msg.what) {
                 case SWITCH_EARPIECE:
+                case USER_SWITCH_EARPIECE:
                     if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
                         transitionTo(mActiveEarpieceRoute);
                     } else {
@@ -435,6 +446,7 @@
                     }
                     return HANDLED;
                 case SWITCH_BLUETOOTH:
+                case USER_SWITCH_BLUETOOTH:
                     if ((mAvailableRoutes & ROUTE_BLUETOOTH) != 0) {
                         transitionTo(mActiveBluetoothRoute);
                     } else {
@@ -442,9 +454,11 @@
                     }
                     return HANDLED;
                 case SWITCH_HEADSET:
+                case USER_SWITCH_HEADSET:
                     // Nothing to do
                     return HANDLED;
                 case SWITCH_SPEAKER:
+                case USER_SWITCH_SPEAKER:
                     transitionTo(mActiveSpeakerRoute);
                     return HANDLED;
                 case SWITCH_FOCUS:
@@ -472,6 +486,7 @@
         @Override
         public void enter() {
             super.enter();
+            mHasUserExplicitlyLeftBluetooth = false;
             updateInternalCallAudioState();
         }
 
@@ -531,7 +546,13 @@
                     updateSystemAudioState();
                     return HANDLED;
                 case CONNECT_BLUETOOTH:
-                    sendInternalMessage(SWITCH_BLUETOOTH);
+                    if (!mHasUserExplicitlyLeftBluetooth) {
+                        sendInternalMessage(SWITCH_BLUETOOTH);
+                    } else {
+                        Log.i(this, "Not switching to BT route from headset because user has " +
+                                "explicitly disconnected.");
+                        updateSystemAudioState();
+                    }
                     return HANDLED;
                 case DISCONNECT_BLUETOOTH:
                     updateSystemAudioState();
@@ -544,6 +565,9 @@
                         sendInternalMessage(SWITCH_BASELINE_ROUTE);
                     }
                     return HANDLED;
+                case BT_AUDIO_DISCONNECT:
+                    // This may be sent as a confirmation by the BT stack after switch off BT.
+                    return HANDLED;
                 case CONNECT_DOCK:
                     // Nothing to do here
                     return HANDLED;
@@ -590,6 +614,9 @@
                 return HANDLED;
             }
             switch (msg.what) {
+                case USER_SWITCH_EARPIECE:
+                    mHasUserExplicitlyLeftBluetooth = true;
+                    // fall through
                 case SWITCH_EARPIECE:
                     if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
                         transitionTo(mActiveEarpieceRoute);
@@ -598,8 +625,12 @@
                     }
                     return HANDLED;
                 case SWITCH_BLUETOOTH:
+                case USER_SWITCH_BLUETOOTH:
                     // Nothing to do
                     return HANDLED;
+                case USER_SWITCH_HEADSET:
+                    mHasUserExplicitlyLeftBluetooth = true;
+                    // fall through
                 case SWITCH_HEADSET:
                     if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
                         transitionTo(mActiveHeadsetRoute);
@@ -607,6 +638,9 @@
                         Log.w(this, "Ignoring switch to headset command. Not available.");
                     }
                     return HANDLED;
+                case USER_SWITCH_SPEAKER:
+                    mHasUserExplicitlyLeftBluetooth = true;
+                    // fall through
                 case SWITCH_SPEAKER:
                     transitionTo(mActiveSpeakerRoute);
                     return HANDLED;
@@ -635,6 +669,7 @@
         @Override
         public void enter() {
             super.enter();
+            mHasUserExplicitlyLeftBluetooth = false;
             updateInternalCallAudioState();
         }
 
@@ -699,6 +734,9 @@
                     sendInternalMessage(SWITCH_BASELINE_ROUTE);
                     mWasOnSpeaker = false;
                     return HANDLED;
+                case BT_AUDIO_DISCONNECT:
+                    sendInternalMessage(SWITCH_BASELINE_ROUTE);
+                    return HANDLED;
                 case DISCONNECT_WIRED_HEADSET:
                     updateSystemAudioState();
                     // No change in audio route required
@@ -751,6 +789,7 @@
             }
             switch(msg.what) {
                 case SWITCH_EARPIECE:
+                case USER_SWITCH_EARPIECE:
                     if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
                         transitionTo(mActiveEarpieceRoute);
                     } else {
@@ -758,6 +797,7 @@
                     }
                     return HANDLED;
                 case SWITCH_BLUETOOTH:
+                case USER_SWITCH_BLUETOOTH:
                     if ((mAvailableRoutes & ROUTE_BLUETOOTH) != 0) {
                         transitionTo(mActiveBluetoothRoute);
                     } else {
@@ -765,6 +805,7 @@
                     }
                     return HANDLED;
                 case SWITCH_HEADSET:
+                case USER_SWITCH_HEADSET:
                     if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
                         transitionTo(mActiveHeadsetRoute);
                     } else {
@@ -772,6 +813,7 @@
                     }
                     return HANDLED;
                 case SWITCH_SPEAKER:
+                case USER_SWITCH_SPEAKER:
                     // Nothing to do
                     return HANDLED;
                 case SWITCH_FOCUS:
@@ -799,6 +841,7 @@
         @Override
         public void enter() {
             super.enter();
+            mHasUserExplicitlyLeftBluetooth = false;
             // Omit setting mWasOnSpeaker to true here, since this does not reflect a call
             // actually being on speakerphone.
             updateInternalCallAudioState();
@@ -861,7 +904,13 @@
                     sendInternalMessage(SWITCH_HEADSET);
                     return HANDLED;
                 case CONNECT_BLUETOOTH:
-                    sendInternalMessage(SWITCH_BLUETOOTH);
+                    if (!mHasUserExplicitlyLeftBluetooth) {
+                        sendInternalMessage(SWITCH_BLUETOOTH);
+                    } else {
+                        Log.i(this, "Not switching to BT route from speaker because user has " +
+                                "explicitly disconnected.");
+                        updateSystemAudioState();
+                    }
                     return HANDLED;
                 case DISCONNECT_BLUETOOTH:
                     updateSystemAudioState();
@@ -871,6 +920,9 @@
                     updateSystemAudioState();
                     // No change in audio route required
                     return HANDLED;
+                case BT_AUDIO_DISCONNECT:
+                    // This may be sent as a confirmation by the BT stack after switch off BT.
+                    return HANDLED;
                 case CONNECT_DOCK:
                     // Nothing to do here
                     return HANDLED;
@@ -908,6 +960,7 @@
     private final StatusBarNotifier mStatusBarNotifier;
     private final CallAudioManager.AudioServiceFactory mAudioServiceFactory;
     private final boolean mDoesDeviceSupportEarpieceRoute;
+    private boolean mHasUserExplicitlyLeftBluetooth = false;
 
     private HashMap<String, Integer> mStateNameToRouteCode;
     private HashMap<Integer, AudioState> mRouteCodeToQuiescentState;
@@ -1214,4 +1267,19 @@
         }
         return true;
     }
+
+    private int calculateBaselineRouteMessage(boolean isExplicitUserRequest) {
+        if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
+            return isExplicitUserRequest ? USER_SWITCH_EARPIECE : SWITCH_EARPIECE;
+        } else if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
+            return isExplicitUserRequest ? USER_SWITCH_HEADSET : SWITCH_HEADSET;
+        } else if (!mDoesDeviceSupportEarpieceRoute) {
+            return isExplicitUserRequest ? USER_SWITCH_SPEAKER : SWITCH_SPEAKER;
+        } else {
+            Log.e(this, new IllegalStateException(),
+                    "Neither headset nor earpiece are available, but there is an " +
+                            "earpiece on the device. Defaulting to earpiece.");
+            return isExplicitUserRequest ? USER_SWITCH_EARPIECE : SWITCH_EARPIECE;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index f0a8998..2634ab3 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -94,6 +94,7 @@
         void onVideoStateChanged(Call call);
         void onCanAddCallChanged(boolean canAddCall);
         void onSessionModifyRequestReceived(Call call, VideoProfile videoProfile);
+        void onHoldToneRequested(Call call);
     }
 
     private static final String TAG = "CallsManager";
@@ -531,11 +532,25 @@
         }
     }
 
-    @VisibleForTesting
     public Collection<Call> getCalls() {
         return Collections.unmodifiableCollection(mCalls);
     }
 
+    /**
+     * Play or stop a call hold tone for a call.  Triggered via
+     * {@link Connection#sendConnectionEvent(String)} when the
+     * {@link Connection#EVENT_ON_HOLD_TONE_START} event or
+     * {@link Connection#EVENT_ON_HOLD_TONE_STOP} event is passed through to the
+     *
+     * @param call The call which requested the hold tone.
+     */
+    @Override
+    public void onHoldToneRequested(Call call) {
+        for (CallsManagerListener listener : mListeners) {
+            listener.onHoldToneRequested(call);
+        }
+    }
+
     @VisibleForTesting
     public Call getForegroundCall() {
         if (mCallAudioManager == null) {
@@ -1231,7 +1246,7 @@
         removeCall(call);
         if (mLocallyDisconnectingCalls.contains(call)) {
             mLocallyDisconnectingCalls.remove(call);
-            Call foregroundCall = getForegroundCall();
+            Call foregroundCall = mCallAudioManager.getPossiblyHeldForegroundCall();
             if (foregroundCall != null && foregroundCall.getState() == CallState.ON_HOLD) {
                 foregroundCall.unhold();
             }
@@ -1313,14 +1328,6 @@
             if (call.isEmergencyCall()) {
                 // We never support add call if one of the calls is an emergency call.
                 return false;
-            } else  if (!call.getChildCalls().isEmpty() && !call.can(Connection.CAPABILITY_HOLD)) {
-                // This is to deal with CDMA conference calls. CDMA conference calls do not
-                // allow the addition of another call when it is already in a 3 way conference.
-                // So, we detect that it is a CDMA conference call by checking if the call has
-                // some children and it does not support the CAPABILILTY_HOLD
-                // TODO: This maybe cleaner if the lower layers can explicitly signal to telecom
-                // about this limitation (b/22880180).
-                return false;
             } else if (call.getParentCall() == null) {
                 count++;
             }
diff --git a/src/com/android/server/telecom/CallsManagerListenerBase.java b/src/com/android/server/telecom/CallsManagerListenerBase.java
index 50716d5..71d6c53 100644
--- a/src/com/android/server/telecom/CallsManagerListenerBase.java
+++ b/src/com/android/server/telecom/CallsManagerListenerBase.java
@@ -80,4 +80,8 @@
     public void onSessionModifyRequestReceived(Call call, VideoProfile videoProfile) {
 
     }
+
+    @Override
+    public void onHoldToneRequested(Call call) {
+    }
 }
diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index 56fbd5c..1feb356 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -587,6 +587,23 @@
                 Log.endSession();
             }
         }
+
+        @Override
+        public void onConnectionEvent(String callId, String event) {
+            Log.startSession("CSW.oCE");
+            long token = Binder.clearCallingIdentity();
+            try {
+                synchronized (mLock) {
+                    Call call = mCallIdMapper.getCall(callId);
+                    if (call != null) {
+                        call.onConnectionEvent(event);
+                    }
+                }
+            } finally {
+                Binder.restoreCallingIdentity(token);
+                Log.endSession();
+            }
+        }
     }
 
     private final Adapter mAdapter = new Adapter();
diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java
index d82240e..7f9bbab 100644
--- a/src/com/android/server/telecom/CreateConnectionProcessor.java
+++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -423,6 +423,7 @@
             notifyCallConnectionFailure(errorDisconnectCause);
             return;
         }
+        mLastErrorDisconnectCause = errorDisconnectCause;
         attemptNextPhoneAccount();
     }
 }
diff --git a/src/com/android/server/telecom/Log.java b/src/com/android/server/telecom/Log.java
index 5e2dc9d..8daf6c1 100644
--- a/src/com/android/server/telecom/Log.java
+++ b/src/com/android/server/telecom/Log.java
@@ -101,6 +101,8 @@
         public static final String BLOCK_CHECK_INITIATED = "BLOCK_CHECK_INITIATED";
         public static final String BLOCK_CHECK_TIMED_OUT = "BLOCK_CHECK_TIMED_OUT";
         public static final String BLOCK_CHECK_FINISHED = "BLOCK_CHECK_FINISHED";
+        public static final String REMOTELY_HELD = "REMOTELY_HELD";
+        public static final String REMOTELY_UNHELD = "REMOTELY_UNHELD";
 
         /**
          * Maps from a request to a response.  The same event could be listed as the
diff --git a/src/com/android/server/telecom/Ringer.java b/src/com/android/server/telecom/Ringer.java
index db85ee4..ddd2e93 100644
--- a/src/com/android/server/telecom/Ringer.java
+++ b/src/com/android/server/telecom/Ringer.java
@@ -124,8 +124,7 @@
             // call (for the purposes of direct-to-voicemail), the information about custom
             // ringtones should be available by the time this code executes. We can safely
             // request the custom ringtone from the call and expect it to be current.
-            mRingtonePlayer.play(
-                    mRingtoneFactory.getRingtone(foregroundCall.getRingtone()));
+            mRingtonePlayer.play(mRingtoneFactory, foregroundCall.getRingtone());
         } else {
             Log.v(this, "startRingingOrCallWaiting, skipping because volume is 0");
         }
diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 9361160..c4ad40a 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -967,7 +967,8 @@
                                     phoneAccountHandle.getComponentName().getPackageName());
                             // Make sure it doesn't cross the UserHandle boundary
                             enforceUserHandleMatchesCaller(phoneAccountHandle);
-                            enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle);
+                            enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle,
+                                    Binder.getCallingUserHandle());
                         }
                         long token = Binder.clearCallingIdentity();
                         try {
@@ -1009,7 +1010,8 @@
 
                         // Make sure it doesn't cross the UserHandle boundary
                         enforceUserHandleMatchesCaller(phoneAccountHandle);
-                        enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle);
+                        enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle,
+                                Binder.getCallingUserHandle());
                         long token = Binder.clearCallingIdentity();
 
                         try {
@@ -1182,10 +1184,18 @@
         /**
          * @see android.telecom.TelecomManager#launchManageBlockedNumbersActivity
          */
+        // TODO: Delete this.
         @Override
         public void launchManageBlockedNumbersActivity(String callingPackageName) {
             BlockedNumbersActivity.start(mContext);
         }
+
+        // TODO: Add a link to TelecomManager#createManageBlockedNumbersIntent
+        @Override
+        public Intent createManageBlockedNumbersIntent() {
+            // TODO: Implement this.
+            return null;
+        }
     };
 
     private Context mContext;
@@ -1296,9 +1306,10 @@
 
     // Enforce that the PhoneAccountHandle being passed in is both registered to the current user
     // and enabled.
-    private void enforcePhoneAccountIsRegisteredEnabled(PhoneAccountHandle phoneAccountHandle) {
-        PhoneAccount phoneAccount = mPhoneAccountRegistrar.getPhoneAccountOfCurrentUser(
-                phoneAccountHandle);
+    private void enforcePhoneAccountIsRegisteredEnabled(PhoneAccountHandle phoneAccountHandle,
+                                                        UserHandle callingUserHandle) {
+        PhoneAccount phoneAccount = mPhoneAccountRegistrar.getPhoneAccount(phoneAccountHandle,
+                callingUserHandle);
         if(phoneAccount == null) {
             EventLog.writeEvent(0x534e4554, "26864502", Binder.getCallingUid(), "R");
             throw new SecurityException("This PhoneAccountHandle is not registered for this user!");
diff --git a/src/com/android/server/telecom/TelecomSystem.java b/src/com/android/server/telecom/TelecomSystem.java
index f484d6e..16e8ea2 100644
--- a/src/com/android/server/telecom/TelecomSystem.java
+++ b/src/com/android/server/telecom/TelecomSystem.java
@@ -165,7 +165,8 @@
                         return context.getContentResolver().openInputStream(uri);
                     }
                 });
-        BluetoothManager bluetoothManager = new BluetoothManager(mContext);
+        BluetoothManager bluetoothManager = new BluetoothManager(mContext,
+                new BluetoothAdapterProxy());
         WiredHeadsetManager wiredHeadsetManager = new WiredHeadsetManager(mContext);
         SystemStateProvider systemStateProvider = new SystemStateProvider(mContext);
 
diff --git a/src/com/android/server/telecom/components/UserCallIntentProcessor.java b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
index 65258d9..97a59eb 100644
--- a/src/com/android/server/telecom/components/UserCallIntentProcessor.java
+++ b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
@@ -20,6 +20,7 @@
 import com.android.server.telecom.Log;
 import com.android.server.telecom.R;
 import com.android.server.telecom.TelephonyUtil;
+import com.android.server.telecom.UserUtil;
 
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -97,17 +98,22 @@
                     PhoneAccount.SCHEME_SIP : PhoneAccount.SCHEME_TEL, uriString, null);
         }
 
-        final UserManager userManager =
-                (UserManager) mContext.getSystemService(Context.USER_SERVICE);
-        if (userManager.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, mUserHandle)
-                && !TelephonyUtil.shouldProcessAsEmergency(mContext, handle)) {
-            // Only emergency calls are allowed for users with the DISALLOW_OUTGOING_CALLS
-            // restriction.
-            showErrorDialogForRestrictedOutgoingCall(mContext,
-                    R.string.outgoing_call_not_allowed_user_restriction);
-            Log.w(this, "Rejecting non-emergency phone call due to DISALLOW_OUTGOING_CALLS "
-                    + "restriction");
-            return;
+        // Check DISALLOW_OUTGOING_CALLS restriction. Note: We are skipping this check in a managed
+        // profile user because this check can always be bypassed by copying and pasting the phone
+        // number into the personal dialer.
+        if (!UserUtil.isManagedProfile(mContext, mUserHandle)) {
+            final UserManager userManager =
+                    (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+            if (userManager.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, mUserHandle)
+                    && !TelephonyUtil.shouldProcessAsEmergency(mContext, handle)) {
+                // Only emergency calls are allowed for users with the DISALLOW_OUTGOING_CALLS
+                // restriction.
+                showErrorDialogForRestrictedOutgoingCall(mContext,
+                        R.string.outgoing_call_not_allowed_user_restriction);
+                Log.w(this, "Rejecting non-emergency phone call due to DISALLOW_OUTGOING_CALLS "
+                        + "restriction");
+                return;
+            }
         }
 
         if (!canCallNonEmergency && !TelephonyUtil.shouldProcessAsEmergency(mContext, handle)) {
diff --git a/src/com/android/server/telecom/settings/BlockedNumbersActivity.java b/src/com/android/server/telecom/settings/BlockedNumbersActivity.java
index c36f55f..5c46161 100644
--- a/src/com/android/server/telecom/settings/BlockedNumbersActivity.java
+++ b/src/com/android/server/telecom/settings/BlockedNumbersActivity.java
@@ -33,6 +33,8 @@
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 import com.android.server.telecom.R;
 
@@ -53,7 +55,11 @@
     private BlockedNumbersAdapter mAdapter;
     private TextView mAddButton;
     private ProgressBar mProgressBar;
+    private RelativeLayout mButterBar;
     @Nullable private Button mBlockButton;
+    private TextView mReEnableButton;
+
+    private BroadcastReceiver mBlockingStatusReceiver;
 
     public static void start(Context context) {
         Intent intent = new Intent(context, BlockedNumbersActivity.class);
@@ -85,7 +91,6 @@
         mAddButton.setOnClickListener(this);
 
         mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
-
         String[] fromColumns = {BlockedNumberContract.BlockedNumbers.COLUMN_ORIGINAL_NUMBER};
         int[] toViews = {R.id.blocked_number};
         mAdapter = new BlockedNumbersAdapter(this, R.xml.layout_blocked_number, null, fromColumns,
@@ -96,10 +101,31 @@
         listView.setDivider(null);
         listView.setDividerHeight(0);
 
+        mButterBar = (RelativeLayout) findViewById(R.id.butter_bar);
+        mReEnableButton = (TextView) mButterBar.findViewById(R.id.reenable_button);
+        mReEnableButton.setOnClickListener(this);
+
+        updateButterBar();
+
+        mBlockingStatusReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                updateButterBar();
+            }
+        };
+        registerReceiver(mBlockingStatusReceiver, new IntentFilter(
+                BlockedNumberContract.SystemContract.ACTION_BLOCK_SUPPRESSION_STATE_CHANGED));
+
         getLoaderManager().initLoader(0, null, this);
     }
 
     @Override
+    protected void onDestroy() {
+        unregisterReceiver(mBlockingStatusReceiver);
+        super.onDestroy();
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
@@ -110,6 +136,14 @@
         }
     }
 
+    private void updateButterBar() {
+        if (BlockedNumberContract.SystemContract.getBlockSuppressionStatus(this).isSuppressed) {
+            mButterBar.setVisibility(View.VISIBLE);
+        } else {
+            mButterBar.setVisibility(View.GONE);
+        }
+    }
+
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         return new CursorLoader(this, BlockedNumberContract.BlockedNumbers.CONTENT_URI,
@@ -132,6 +166,9 @@
     public void onClick(View view) {
         if (view == mAddButton) {
             showAddBlockedNumberDialog();
+        } else if (view == mReEnableButton) {
+            BlockedNumberContract.SystemContract.endBlockSuppression(this);
+            mButterBar.setVisibility(View.GONE);
         }
     }
 
@@ -159,6 +196,12 @@
                         mBlockButton = ((AlertDialog) dialog)
                                 .getButton(AlertDialog.BUTTON_POSITIVE);
                         mBlockButton.setEnabled(false);
+                        // show keyboard
+                        InputMethodManager inputMethodManager =
+                                (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                        inputMethodManager.showSoftInput(editText,
+                                InputMethodManager.SHOW_IMPLICIT);
+
                     }
                 });
         dialog.show();
diff --git a/tests/src/com/android/server/telecom/tests/BluetoothManagerTest.java b/tests/src/com/android/server/telecom/tests/BluetoothManagerTest.java
new file mode 100644
index 0000000..09ef9e1
--- /dev/null
+++ b/tests/src/com/android/server/telecom/tests/BluetoothManagerTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2016 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
+ */
+
+package com.android.server.telecom.tests;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Parcel;
+
+import com.android.server.telecom.BluetoothAdapterProxy;
+import com.android.server.telecom.BluetoothHeadsetProxy;
+import com.android.server.telecom.BluetoothManager;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+
+import java.util.Collections;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class BluetoothManagerTest extends TelecomTestCase {
+    @Mock BluetoothManager.BluetoothStateListener mListener;
+    @Mock BluetoothHeadsetProxy mHeadsetProxy;
+    @Mock BluetoothAdapterProxy mAdapterProxy;
+
+    BluetoothManager mBluetoothManager;
+    BluetoothProfile.ServiceListener serviceListenerUnderTest;
+    BroadcastReceiver receiverUnderTest;
+
+    private BluetoothDevice device1;
+
+    public void setUp() throws Exception {
+        super.setUp();
+        initializeDevice();
+        mContext = mComponentContextFixture.getTestDouble().getApplicationContext();
+        mBluetoothManager = new BluetoothManager(mContext, mAdapterProxy);
+
+        ArgumentCaptor<BluetoothProfile.ServiceListener> serviceCaptor =
+                ArgumentCaptor.forClass(BluetoothProfile.ServiceListener.class);
+        verify(mAdapterProxy).getProfileProxy(eq(mContext),
+                serviceCaptor.capture(), eq(BluetoothProfile.HEADSET));
+        serviceListenerUnderTest = serviceCaptor.getValue();
+
+        ArgumentCaptor<BroadcastReceiver> receiverCaptor =
+                ArgumentCaptor.forClass(BroadcastReceiver.class);
+        verify(mContext).registerReceiver(receiverCaptor.capture(), any(IntentFilter.class));
+        receiverUnderTest = receiverCaptor.getValue();
+
+        mBluetoothManager.setBluetoothStateListener(mListener);
+        mBluetoothManager.setBluetoothHeadsetForTesting(mHeadsetProxy);
+    }
+
+    public void testIsBluetoothAvailableWithNoDevices() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.<BluetoothDevice>emptyList());
+        assertFalse(mBluetoothManager.isBluetoothAvailable());
+    }
+
+    public void testIsBluetoothAvailable() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        assertTrue(mBluetoothManager.isBluetoothAvailable());
+    }
+
+    public void testIsAudioConnectedWithNoDevices() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.<BluetoothDevice>emptyList());
+        assertFalse(mBluetoothManager.isBluetoothAudioConnected());
+    }
+
+    public void testIsAudioConnectedWhenAudioNotOn() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(false);
+        assertFalse(mBluetoothManager.isBluetoothAudioConnected());
+    }
+
+    public void testIsAudioConnectedWhenAudioOn() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(true);
+        assertTrue(mBluetoothManager.isBluetoothAudioConnected());
+    }
+
+    public void testShouldBePendingAfterConnectAudio() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(false);
+        mBluetoothManager.connectBluetoothAudio();
+        verify(mHeadsetProxy).connectAudio();
+        assertFalse(mBluetoothManager.isBluetoothAudioConnected());
+        assertTrue(mBluetoothManager.isBluetoothAudioConnectedOrPending());
+    }
+
+    public void testDisconnectAudioWhenHeadsetServiceConnected() {
+        mBluetoothManager.disconnectBluetoothAudio();
+        verify(mHeadsetProxy).disconnectAudio();
+    }
+
+    public void testDisconnectAudioWithNoHeadsetService() {
+        mBluetoothManager.setBluetoothHeadsetForTesting(null);
+        mBluetoothManager.disconnectBluetoothAudio();
+        verify(mHeadsetProxy, never()).disconnectAudio();
+    }
+
+    public void testConnectServiceWhenUninitialized1() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.<BluetoothDevice>emptyList());
+        serviceListenerUnderTest.onServiceConnected(BluetoothProfile.HEALTH, null);
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_UNINITIALIZED,
+                BluetoothManager.BLUETOOTH_DISCONNECTED);
+    }
+
+    public void testConnectServiceWhenUninitialized2() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(false);
+        serviceListenerUnderTest.onServiceConnected(BluetoothProfile.HEALTH, null);
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_UNINITIALIZED,
+                BluetoothManager.BLUETOOTH_DEVICE_CONNECTED);
+    }
+
+    public void testConnectServiceWhenUninitialized3() {
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(true);
+        serviceListenerUnderTest.onServiceConnected(BluetoothProfile.HEALTH, null);
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_UNINITIALIZED,
+                BluetoothManager.BLUETOOTH_AUDIO_CONNECTED);
+    }
+
+    public void testReceiveAudioDisconnectWhenConnected() {
+        mBluetoothManager.setInternalBluetoothState(BluetoothManager.BLUETOOTH_AUDIO_CONNECTED);
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(false);
+        receiverUnderTest.onReceive(mContext,
+                buildAudioActionIntent(BluetoothHeadset.STATE_AUDIO_DISCONNECTED));
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_AUDIO_CONNECTED,
+                BluetoothManager.BLUETOOTH_DEVICE_CONNECTED);
+    }
+
+    public void testReceiveAudioConnectWhenDisconnected() {
+        mBluetoothManager.setInternalBluetoothState(BluetoothManager.BLUETOOTH_DEVICE_CONNECTED);
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(true);
+        receiverUnderTest.onReceive(mContext,
+                buildAudioActionIntent(BluetoothHeadset.STATE_AUDIO_CONNECTED));
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_DEVICE_CONNECTED,
+                BluetoothManager.BLUETOOTH_AUDIO_CONNECTED);
+    }
+
+    public void testReceiveAudioConnectWhenPending() {
+        mBluetoothManager.setInternalBluetoothState(BluetoothManager.BLUETOOTH_AUDIO_PENDING);
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(true);
+        receiverUnderTest.onReceive(mContext,
+                buildAudioActionIntent(BluetoothHeadset.STATE_AUDIO_CONNECTED));
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_AUDIO_PENDING,
+                BluetoothManager.BLUETOOTH_AUDIO_CONNECTED);
+    }
+
+    public void testReceiveAudioDisconnectWhenPending() {
+        mBluetoothManager.setInternalBluetoothState(BluetoothManager.BLUETOOTH_AUDIO_PENDING);
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(false);
+        receiverUnderTest.onReceive(mContext,
+                buildAudioActionIntent(BluetoothHeadset.STATE_AUDIO_DISCONNECTED));
+        verify(mListener).onBluetoothStateChange(BluetoothManager.BLUETOOTH_AUDIO_PENDING,
+                BluetoothManager.BLUETOOTH_DEVICE_CONNECTED);
+    }
+
+    public void testReceiveAudioConnectingWhenPending() {
+        mBluetoothManager.setInternalBluetoothState(BluetoothManager.BLUETOOTH_AUDIO_PENDING);
+        when(mHeadsetProxy.getConnectedDevices()).thenReturn(
+                Collections.singletonList(device1));
+        when(mHeadsetProxy.isAudioConnected(eq(device1))).thenReturn(false);
+        receiverUnderTest.onReceive(mContext,
+                buildAudioActionIntent(BluetoothHeadset.STATE_AUDIO_CONNECTING));
+        verify(mListener, never()).onBluetoothStateChange(anyInt(), anyInt());
+    }
+
+    private Intent buildAudioActionIntent(int state) {
+        Intent i = new Intent(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED);
+        i.putExtra(BluetoothHeadset.EXTRA_STATE, state);
+        return i;
+    }
+
+    private void initializeDevice() {
+        Parcel p1 = Parcel.obtain();
+        p1.writeString("00:01:02:03:04:05");
+        p1.setDataPosition(0);
+        device1 = BluetoothDevice.CREATOR.createFromParcel(p1);
+        p1.recycle();
+    }
+}
diff --git a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
index 776bd8c..7a23923 100644
--- a/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
@@ -190,6 +190,46 @@
         verifyNewSystemCallAudioState(expectedMiddleState, initState);
     }
 
+    @MediumTest
+    public void testUserBluetoothSwitchOff() {
+        CallAudioRouteStateMachine stateMachine = new CallAudioRouteStateMachine(
+                mContext,
+                mockCallsManager,
+                mockBluetoothManager,
+                mockWiredHeadsetManager,
+                mockStatusBarNotifier,
+                mAudioServiceFactory,
+                true);
+
+        when(mockBluetoothManager.isBluetoothAudioConnectedOrPending()).thenReturn(false);
+        when(mockBluetoothManager.isBluetoothAvailable()).thenReturn(true);
+        when(mockAudioManager.isSpeakerphoneOn()).thenReturn(true);
+        CallAudioState initState = new CallAudioState(false, CallAudioState.ROUTE_BLUETOOTH,
+                CallAudioState.ROUTE_EARPIECE | CallAudioState.ROUTE_BLUETOOTH);
+        stateMachine.initialize(initState);
+
+        stateMachine.sendMessageWithSessionInfo(CallAudioRouteStateMachine.SWITCH_FOCUS,
+                CallAudioRouteStateMachine.HAS_FOCUS);
+        stateMachine.sendMessageWithSessionInfo(
+                CallAudioRouteStateMachine.USER_SWITCH_BASELINE_ROUTE);
+        CallAudioState expectedEndState = new CallAudioState(false,
+                CallAudioState.ROUTE_EARPIECE,
+                CallAudioState.ROUTE_EARPIECE | CallAudioState.ROUTE_BLUETOOTH);
+
+        waitForStateMachineActionCompletion(stateMachine, CallAudioRouteStateMachine.RUN_RUNNABLE);
+        verifyNewSystemCallAudioState(initState, expectedEndState);
+        resetMocks();
+
+        stateMachine.sendMessageWithSessionInfo(
+                CallAudioRouteStateMachine.DISCONNECT_BLUETOOTH);
+        stateMachine.sendMessageWithSessionInfo(
+                CallAudioRouteStateMachine.CONNECT_BLUETOOTH);
+
+        waitForStateMachineActionCompletion(stateMachine, CallAudioRouteStateMachine.RUN_RUNNABLE);
+
+        assertEquals(expectedEndState, stateMachine.getCurrentCallAudioState());
+    }
+
     @SmallTest
     public void testInitializationWithEarpieceNoHeadsetNoBluetooth() {
         CallAudioState expectedState = new CallAudioState(false, CallAudioState.ROUTE_EARPIECE,
@@ -709,6 +749,15 @@
 
         // Verify that no substantive interactions have taken place with the
         // rest of the system
+        verifyNoSystemAudioChanges();
+
+        // Verify the end state
+        CallAudioState expectedState = new CallAudioState(false, params.expectedRoute,
+                params.expectedAvailableRoutes | CallAudioState.ROUTE_SPEAKER);
+        assertEquals(expectedState, stateMachine.getCurrentCallAudioState());
+    }
+
+    private void verifyNoSystemAudioChanges() {
         verify(mockBluetoothManager, never()).disconnectBluetoothAudio();
         verify(mockBluetoothManager, never()).connectBluetoothAudio();
         verify(mockAudioManager, never()).setSpeakerphoneOn(any(Boolean.class));
@@ -716,11 +765,6 @@
                 any(CallAudioState.class));
         verify(mockConnectionServiceWrapper, never()).onCallAudioStateChanged(
                 any(Call.class), any(CallAudioState.class));
-
-        // Verify the end state
-        CallAudioState expectedState = new CallAudioState(false, params.expectedRoute,
-                params.expectedAvailableRoutes | CallAudioState.ROUTE_SPEAKER);
-        assertEquals(expectedState, stateMachine.getCurrentCallAudioState());
     }
 
     private void verifyNewSystemCallAudioState(CallAudioState expectedOldState,
diff --git a/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java b/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
index d0b723a..a705aeb 100644
--- a/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
+++ b/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
@@ -541,6 +541,10 @@
 
     @SmallTest
     public void testAddNewIncomingCall() throws Exception {
+        PhoneAccount phoneAccount = makePhoneAccount(TEL_PA_HANDLE_CURRENT).build();
+        phoneAccount.setIsEnabled(true);
+        doReturn(phoneAccount).when(mFakePhoneAccountRegistrar).getPhoneAccount(
+                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));
         doNothing().when(mAppOpsManager).checkPackage(anyInt(), anyString());
         Bundle extras = createSampleExtras();
 
@@ -573,6 +577,10 @@
 
     @SmallTest
     public void testAddNewUnknownCall() throws Exception {
+        PhoneAccount phoneAccount = makePhoneAccount(TEL_PA_HANDLE_CURRENT).build();
+        phoneAccount.setIsEnabled(true);
+        doReturn(phoneAccount).when(mFakePhoneAccountRegistrar).getPhoneAccount(
+                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));
         doNothing().when(mAppOpsManager).checkPackage(anyInt(), anyString());
         Bundle extras = createSampleExtras();