diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 6f0ff09..b4915b9 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -533,86 +533,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_captured_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="54"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="55"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_bg_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="56"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_fill_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="57"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="58"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;message_bubble_incoming&quot;>#52534D&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -677,86 +597,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_captured_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="205"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="206"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_bg_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="207"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_fill_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="208"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="209"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;message_icon_background_outgoing&quot;>#FBBC04&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -5005,36 +4845,4 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                    android:progressBackgroundTint=&quot;@color/sfps_enrollment_progress_bar_bg_color&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/sfps_enroll_enrolling.xml"
-            line="71"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                    android:progressBackgroundTint=&quot;@color/sfps_enrollment_progress_bar_bg_color&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/sfps_enroll_enrolling.xml"
-            line="71"
-            column="20"/>
-    </issue>
-
 </issues>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 70ccfb6..dbdeb81 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Jy kan begin om jou <xliff:g id="NAME">^1</xliff:g> te gebruik"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batterystatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batteryvlak"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Gemeenskaplik"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Gemeenskaplike instellings"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Toegangspuntname"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redigeer toegangspunt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nie gestel nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 294592c..72b783a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"የእርስዎን <xliff:g id="NAME">^1</xliff:g> መጠቀም መጀመር ይችላሉ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"የባትሪሁኔታ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"የባትሪደረጃ፡"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"የጋራ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"የጋራ ቅንብሮች"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"የመዳረሻ ነጥብ አርትዕ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"አልተዘጋጀም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bdfce42..ffe82e8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1869,10 +1869,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"بإمكانك بدء استخدام \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="battery_status_title" msgid="4661768220545945771">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"مستوى البطارية"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"الإعدادات المشتركة"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"الإعدادات المشتركة"</string>
     <string name="apn_settings" msgid="4295467389400441299">"أسماء نقاط الوصول"</string>
     <string name="apn_edit" msgid="2003683641840248741">"تعديل نقطة الوصول"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"لم يتم الضبط."</string>
@@ -2482,7 +2480,7 @@
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"عناصر التحكّم في الميزات"</string>
     <string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
     <string name="talkback_summary" msgid="5820927220378864281">"هو قارئ شاشة مُصمَّم في الأساس للأشخاص الذين يعانون فقدان البصر أو ضعفه."</string>
-    <string name="select_to_speak_summary" msgid="1995285446766920925">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
+    <string name="select_to_speak_summary" msgid="1995285446766920925">"يمكنك النقر على عناصر على شاشتك لتتم قراءتها بصوت عالٍ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"الإعدادات المفضّلة للشرح"</string>
     <string name="accessibility_captioning_about_title" msgid="3542171637334191563">"لمحة عن الإعدادات المفضّلة للشرح"</string>
     <string name="accessibility_captioning_footer_learn_more_content_description" msgid="5730040700677017706">"تعرّف على مزيد من المعلومات حول الإعدادات المفضّلة للشرح"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0039bfb..649e3a8 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"আপুনি আপোনাৰ <xliff:g id="NAME">^1</xliff:g> ব্যৱহাৰ কৰা আৰম্ভ কৰিব পাৰে"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"বেটাৰীৰ স্থিতি"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"বেটাৰীৰ পৰিমাণ"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"সম্প্ৰদায়ৰ সৈতে জড়িত"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"সম্প্ৰদায়ৰ সৈতে জড়িত ছেটিং"</string>
     <string name="apn_settings" msgid="4295467389400441299">"এপিএনসমূহ"</string>
     <string name="apn_edit" msgid="2003683641840248741">"এক্সেছ পইণ্ট সম্পাদনা কৰক"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ছেট কৰা হোৱা নাই"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index f0ce667..57aba54 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> cihazının istifadəsinə başlaya bilərsiniz"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batareya statusu"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Enerji səviyyəsi"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Kommunal"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Kommunal ayarlar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-lər"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Giriş nöqtəsinə düzəliş edin"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Təyin edilməyib"</string>
@@ -2574,7 +2572,7 @@
     <string name="accessibility_quick_settings_tooltip_dismiss" msgid="3269120277643884190">"Qapadın"</string>
     <string name="accessibility_daltonizer_about_intro_text" product="default" msgid="3636710237139542212">"Telefonunuzda rənglərin necə göstərilməsini tənzimləyin"</string>
     <string name="accessibility_daltonizer_about_intro_text" product="tablet" msgid="3702653229533336133">"Planşetinizdə rənglərin necə göstərilməsini tənzimləyin"</string>
-    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rəng korreksiyası istifadə edilsin"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rəng korreksiyası işlədilsin"</string>
     <string name="accessibility_daltonizer_shortcut_title" msgid="7480360363995502369">"Rəng korreksiyası qısayolu"</string>
     <string name="accessibility_daltonizer_about_title" msgid="6063650804116981287">"Rəng korreksiyası haqqında"</string>
     <string name="accessibility_daltonizer_footer_learn_more_content_description" msgid="2091679253892040910">"Rəng korreksiyası haqqında ətraflı öyrənin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 8ec2041..0e7356f 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -684,7 +684,7 @@
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, ukloni"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Šifrovanje"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifruj tablet"</string>
-    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifruj telefon"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifrovanje telefona"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Šifrovano"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Podesite zaključavanje ekrana"</string>
     <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Da biste poboljšali bezbednost, podesite PIN, šablon ili lozinku za ovaj uređaj"</string>
@@ -1806,10 +1806,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Možete da počnete da koristite: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivo baterije"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Zajedničko"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Zajednička podešavanja"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Nazivi pristupnih tačaka"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Izmena pristupne tačke"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nije podešeno"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7bcae0d..ff8d918 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Цяпер вы можаце выкарыстоўваць носьбіт \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Стан батарэі"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Узровень батарэі"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Супольныя"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Супольныя налады"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Змяніць пункт доступу"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не зададзена"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2262bed..cda6bbd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Можете да започнете да използвате хранилището си (<xliff:g id="NAME">^1</xliff:g>)"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Ниво на батерията"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Общи"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Общи настройки"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Редакт. на точка за достъп"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не е зададено"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6f339b4..046e74f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1806,8 +1806,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Možete početi koristiti medij <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivo napunjenosti baterije"</string>
-    <string name="communal_settings_title" msgid="2845678473945902115">"Zajedničko"</string>
-    <string name="communal_settings_summary" msgid="4923914136953940317">"Zajedničke postavke"</string>
+    <string name="communal_settings_title" msgid="2845678473945902115">"Opće"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Opće postavke"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ovi"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Uredi pristupnu tačku"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nije postavljeno"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7853032..f7c0db1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Pots començar a utilitzar la teva <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivell de la bateria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comuna"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configuració comuna"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Edita el punt d\'accés"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"No definit"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b2e4a4b..2c43784 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Můžete začít používat úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stav baterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nabití baterie"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Komunální"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Komunální nastavení"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Přístupové body"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Upravit přístupový bod"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nenastaveno"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f351ea8..eef5a3f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -556,7 +556,7 @@
     <string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="5857063580604638331">"Fingeraftrykssensoren sidder på afbryderknappen. Det er den flade knap ud for den hævede lydstyrkeknap på telefonens kant.\n\nNår du trykker på afbryderknappen, slukkes skærmen."</string>
     <string name="security_settings_udfps_enroll_find_sensor_message" msgid="8383106460819519961">"Fingeraftrykssensoren er på din skærm. Du registrerer dit fingeraftryk på den næste skærm."</string>
     <string name="security_settings_udfps_enroll_find_sensor_start_button" msgid="3172268783620336357">"Start"</string>
-    <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"Bevæg fingeren hen over skærmen for at finde sensoren. Hold fingeren nede på fingeraftrykslæseren."</string>
+    <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"Bevæg fingeren hen over skærmen for at finde sensoren. Hold fingeren på fingeraftrykslæseren."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration med enhed og lokation af fingeraftrykslæser"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
@@ -566,7 +566,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Placer fingeren på sensoren, og løft, når du mærker en vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Tryk fingeren helt ned på sensoren, indtil du mærker en vibration"</string>
     <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"Uden at trykke på knappen skal du holde dit fingeraftryk på sensoren, indtil du mærker en vibration.\n\nFlyt din finger en smule, hver gang du mærker en vibration. På den måde registreres en større del af dit fingeraftryk."</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Hold fingeren nede på fingeraftrykssensoren"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Hold fingeren på fingeraftrykssensoren"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Løft, og tryk igen"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Én gang til"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Følg fingeraftryksikonet"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Du kan nu bruge dit <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batteristatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batteriniveau"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Fælles"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Fælles indstillinger"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Adgangspunkter"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Rediger adgangspunkt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ikke angivet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index adeaafb..3b788a1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1786,10 +1786,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Deine <xliff:g id="NAME">^1</xliff:g> ist jetzt einsatzbereit"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akkustatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akkustand"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Gemeinschaftlich"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Gemeinschaftliche Einstellungen"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Zugangspunkt bearbeiten"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nicht definiert"</string>
@@ -2455,7 +2453,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Wenn du eine Bedienungshilfe verwenden möchtest, wische vom unteren Displayrand mit zwei Fingern nach oben.\n\nWenn du zwischen den Funktionen wechseln möchtest, wische mit zwei Fingern über das Display nach oben und halte."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Wenn du eine Bedienungshilfe verwenden möchtest, wische vom unteren Displayrand mit drei Fingern nach oben.\n\nWenn du zwischen den Funktionen wechseln möchtest, wische mit drei Fingern über das Display nach oben und halte."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Verknüpfung für „<xliff:g id="SERVICE">%1$s</xliff:g>“"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Kurzbefehl für „<xliff:g id="SERVICE">%1$s</xliff:g>“"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Schaltfläche „Bedienungshilfen“"</string>
     <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="5489284264414421286">"Touch-Geste für Bedienungshilfen"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Mit zwei Fingern nach oben wischen"</string>
@@ -2688,7 +2686,7 @@
     <string name="color_cyan" msgid="4341758639597035927">"Blaugrün"</string>
     <string name="color_yellow" msgid="5957551912912679058">"Gelb"</string>
     <string name="color_magenta" msgid="8943538189219528423">"Magenta"</string>
-    <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> die vollständige Kontrolle über dein Gerät geben?"</string>
+    <string name="enable_service_title" msgid="7231533866953706788">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ die vollständige Kontrolle über dein Gerät geben?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil die Berechtigungsanfrage von einer App verdeckt wird."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> fordert eine volle Kontrolle für dieses Gerät an. Der Dienst kann den Bildschirm lesen und im Namen von Nutzern mit Bedarf an Bedienungshilfen handeln. Dieses Maß an Kontrolle ist für die meisten Apps ungeeignet."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0804613..1b8d2e6 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2438,7 +2438,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
+    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use Accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c451e10..22a7e20 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2438,7 +2438,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
+    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use Accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3e5af2c..4325013 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2438,7 +2438,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
+    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use Accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 77d17ef..4f480ad 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="passpoint_content" msgid="5219226173518418335">"Credenciales de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"Método EAP"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Autenticación de fase 2"</string>
-    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificado de CA"</string>
+    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificado de la AC"</string>
     <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Estado de certificado en línea"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Dominio"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"Certificado del usuario"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Para comenzar, puedes usar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estado de batería"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivel de la batería"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comunal"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configuración comunal"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sin establecer"</string>
@@ -3143,7 +3141,7 @@
     <string name="credentials_reset" msgid="4246628389366452655">"Borrar credenciales"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Quitar todos los certificados"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Credenciales de confianza"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"Mostrar certificados de CA de confianza"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"Mostrar certificados de la AC de confianza"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver y modificar las credenciales guardadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
@@ -3154,7 +3152,7 @@
     <string name="credentials_erased" msgid="9121052044566053345">"Credenciales borradas"</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"Imposible borrar almac credenc"</string>
     <string name="usage_access_title" msgid="1580006124578134850">"Acceso a datos de uso"</string>
-    <string name="ca_certificate" msgid="3076484307693855611">"Certificado de CA"</string>
+    <string name="ca_certificate" msgid="3076484307693855611">"Certificado de la AC"</string>
     <string name="user_certificate" msgid="6897024598058566466">"Cert. de usuario de app y VPN"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"Certificado de Wi‑Fi"</string>
     <string name="ca_certificate_warning_title" msgid="7951148441028692619">"Tus datos no serán privados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 69a4085..1a4724e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Ya puedes empezar a usar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivel de batería"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comunes"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ajustes comunes"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sin establecer"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b9250b6..dde172d 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> on kasutamiseks valmis"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Aku olek"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Aku tase"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ühised"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ühised seaded"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Pääsupunktid (APN-id)"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Pääsupunkti muutmine"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Määramata"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0da7d65..1becaff 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> erabiltzen has zaitezke"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Bateriaren egoera"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Bateria-maila"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Komunak"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ezarpen komunak"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNak"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editatu sarbide-puntua"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ezarri gabe"</string>
@@ -3018,7 +3016,7 @@
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Beste erabiltzaileak"</string>
     <string name="advanced_battery_graph_subtext" msgid="6816737986172678550">"Gailuaren erabileran oinarritzen da gelditzen den bateriaren estimazioa"</string>
-    <string name="estimated_time_left" msgid="948717045180211777">"Geratzen den denbora, gutxi gorabehera"</string>
+    <string name="estimated_time_left" msgid="948717045180211777">"Geratzen den denbora estimatua"</string>
     <string name="estimated_charging_time_left" msgid="2287135413363961246">"guztiz kargatu arte"</string>
     <string name="estimated_time_description" msgid="211058785418596009">"Estimazioak gorabeherak izan ditzake erabileraren arabera"</string>
     <string name="menu_stats_unplugged" msgid="7125297366200634285">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> entxufea atera zenetik"</string>
@@ -3143,7 +3141,7 @@
     <string name="credentials_reset" msgid="4246628389366452655">"Garbitu kredentzialak"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Kendu ziurtagiri guztiak"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Kredentzial fidagarriak"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"Bistaratu CA fidagarrien ziurtagiriak"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"Bistaratu autoritate ziurtagiri-emaile fidagarri batek jaulkitako ziurtagiriak"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Erabiltzaile-kredentzialak"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ikusi eta aldatu gordetako kredentzialak"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Aurreratuak"</string>
@@ -3295,8 +3293,8 @@
     <string name="data_usage_menu_split_4g" msgid="3391899816926640583">"4G erabilera bereizia"</string>
     <string name="data_usage_menu_show_wifi" msgid="6380926350184939975">"Erakutsi Wi‑Fi sareen erabilera"</string>
     <string name="data_usage_menu_hide_wifi" msgid="4694889089278302691">"Ezkutatu Wi‑Fi erabilera"</string>
-    <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"Erakuts Ethernet erabilera"</string>
-    <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"Ezkutatu Ethernet erabilera"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"Erakutsi Ethernet-erabilera"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"Ezkutatu Ethernet-erabilera"</string>
     <string name="data_usage_menu_metered" msgid="4279260736172851951">"Sarearen murriztapenak"</string>
     <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"Sinkronizatu datuak automatikoki"</string>
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"SIM txartelak"</string>
@@ -4853,7 +4851,7 @@
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Aplikazioak erabilitako datuak"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-sareko datu-erabilera"</string>
     <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operadorearenak ez diren datuen erabilera"</string>
-    <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet datu-erabilera"</string>
+    <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-datuen erabilera"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifia"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
     <string name="cell_data_template" msgid="6077963976103260821">"Datu-konexioaren <xliff:g id="AMOUNT">^1</xliff:g>"</string>
@@ -5150,7 +5148,7 @@
     <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"Azken segurtasun-erregistroa"</string>
     <string name="enterprise_privacy_none" msgid="6026527690979756431">"Bat ere ez"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Instalatutako aplikazioak"</string>
-    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Gutxi gorabeherakoa da aplikazio kopurua. Baliteke Play Store-tik instalatu ez diren aplikazioak kontuan ez izatea."</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Aplikazio kopurua estimazio bat da. Baliteke Play Store-tik instalatu ez diren aplikazioak kontuan ez izatea."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="other">Gutxienez <xliff:g id="COUNT_1">%d</xliff:g> aplikazio</item>
       <item quantity="one">Gutxienez <xliff:g id="COUNT_0">%d</xliff:g> aplikazio</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cfe060a..d5564fe 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -330,15 +330,15 @@
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"درباره «تنظیمات مکان» بیشتر بدانید."</string>
     <string name="account_settings_title" msgid="9138880127246241885">"حساب‌ها"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"امنیت"</string>
-    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"رمزگذاری و اطلاعات کاربری"</string>
+    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"رمزگذاری و اطلاعات اعتباری"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"تلفن رمزگذاری شده است"</string>
     <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"تلفن رمزگذاری‌ نشده است"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"دستگاه رمزگذاری شد"</string>
     <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"دستگاه رمزگذاری نشده است"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"صفحه قفل"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"چه چیزی نشان داده شود"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
-    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل فضای ذخیره‌سازی اطلاعات اعتباری"</string>
+    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تنظیم مکان من، بازگشایی قفل صفحه، قفل فضای ذخیره‌سازی اطلاعات اعتباری"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"حریم خصوصی"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"در دسترس نیست"</string>
     <string name="security_status_title" msgid="6958004275337618656">"وضعیت امنیتی"</string>
@@ -660,7 +660,7 @@
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"امکان استفاده از حسگر اثر انگشت وجود ندارد. به ارائه‌دهنده خدمات تعمیر مراجعه کنید"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"تنظیمات امنیتی بیشتر"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"قفل نمایه کاری، رمزگذاری، و غیره"</string>
-    <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"رمزگذاری، اطلاعات کاربری، و غیره"</string>
+    <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"رمزگذاری، اطلاعات اعتباری، و غیره"</string>
     <string name="security_advanced_settings_keywords" msgid="5294945170370974974">"امنیت، تنظیمات امنیتی بیشتر، تنظیمات بیشتر، تنظیمات امنیتی پیشرفته"</string>
     <string name="privacy_advanced_settings" msgid="8828215456566937719">"تنظیمات حریم خصوصی بیشتر"</string>
     <string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"تکمیل خودکار، کنترل‌های فعالیت، و غیره"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"می‌توانید شروع به استفاده از <xliff:g id="NAME">^1</xliff:g> کنید"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"مقدار شارژ باتری"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"عمومی"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"تنظیمات عمومی"</string>
     <string name="apn_settings" msgid="4295467389400441299">"نام‌های نقاط دستیابی"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ویرایش نقطه دستیابی"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"تنظیم نشده است"</string>
@@ -3136,23 +3134,23 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"با مدیریت خودکار اتصال‌های شبکه، عمر باتری را افزایش می‌دهد و عملکرد دستگاه را بهبود می‌بخشد"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"روشن"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"خاموش"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"حافظه اطلاعات کاربری"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"فضای ذخیره‌سازی اطلاعات اعتباری"</string>
     <string name="credentials_install" msgid="3933218407598415827">"نصب گواهینامه"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"نصب گواهی‌ها از حافظه"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"نصب گواهی‌ها از فضای ذخیره‌سازی"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"‏نصب گواهی‌ها از کارت SD"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"پاک کردن اطلاعات کاربری"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"پاک کردن اطلاعات اعتباری"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"حذف تمام گواهی‌ها"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"اطلاعات کاربری مطمئن"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"‏نمایش گواهی‌های CA مطمئن"</string>
-    <string name="user_credentials" msgid="4044405430790970775">"اطلاعات کاربری"</string>
-    <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات کاربری ذخیره‌شده"</string>
+    <string name="user_credentials" msgid="4044405430790970775">"اطلاعات اعتباری کاربر"</string>
+    <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات اعتباری ذخیره‌شده"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"پیشرفته"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏نصب‌شده برای VPN و برنامه‌ها"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏نصب‌شده برای Wi-Fi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"همه محتوا حذف شود؟"</string>
-    <string name="credentials_erased" msgid="9121052044566053345">"حافظه اطلاعات کاربری پاک شد."</string>
-    <string name="credentials_not_erased" msgid="3611058412683184031">"حافظه اطلاعات کاربری پاک نمی‌شود."</string>
+    <string name="credentials_erased" msgid="9121052044566053345">"فضای ذخیره‌سازی اطلاعات اعتباری پاک شد."</string>
+    <string name="credentials_not_erased" msgid="3611058412683184031">"فضای ذخیره‌سازی اطلاعات اعتباری پاک نمی‌شود."</string>
     <string name="usage_access_title" msgid="1580006124578134850">"برنامه‌های مجاز به دسترسی به داده‌های مصرف"</string>
     <string name="ca_certificate" msgid="3076484307693855611">"گواهینامه مرکز صدور گواهی"</string>
     <string name="user_certificate" msgid="6897024598058566466">"‏گواهینامه کاربر برنامه و VPN"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e5e76d3..40a20e1 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> on nyt käytettävissä"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akun tila"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akun taso"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Yhteiskäyttö"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Yhteiskäytön asetukset"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN:t"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Muokkaa tukiasemaa"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ei asetettu"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 642f149..da0a543 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Vous pouvez commencer à utiliser votre <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"État de la batterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Niveau de la pile"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Commun"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Paramètres communs"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Noms des points d\'accès"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifier le point d\'accès"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Non défini"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 62a4f25..8b0fbbe 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Vous pouvez commencer à utiliser votre <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"État de la batterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Niveau de la batterie"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Communs"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Paramètres communs"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifier le point d\'accès"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Non défini"</string>
@@ -2021,7 +2019,7 @@
     <string name="lockpassword_choose_your_pattern_description" msgid="6808109256008481046">"Pour plus de sécurité, définissez un schéma pour déverrouiller l\'appareil"</string>
     <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"Définir un schéma professionnel"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"Définissez un mot de passe"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Définissez un schéma"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Pour utiliser votre empreinte, définissez un schéma"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"Pour des raisons de sécurité, définissez un code"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Définissez un code"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Saisissez de nouveau votre mot de passe"</string>
@@ -5495,8 +5493,7 @@
     <string name="mobile_data_usage_title" msgid="2047864499317759728">"Consommation de données des applications"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"Mode réseau non valide <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Action ignorée."</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Noms des points d\'accès"</string>
-    <!-- no translation found for keywords_access_point_names (8174967126858505945) -->
-    <skip />
+    <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Voir plus"</string>
     <string name="see_less" msgid="2642392725363552793">"Moins de détails"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f511114..b5c2658 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Podes comezar a usar a túa <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estado da batería"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivel de batería"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comúns"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Opcións de configuración comúns"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sen configurar"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index e3c2c58..088627c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"તમે તમારા <xliff:g id="NAME">^1</xliff:g>નો ઉપયોગ કરવાનું શરૂ કરી શકો છો"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"બૅટરી સ્થિતિ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"બૅટરી સ્તર"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"કૉમ્યુનલ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"કૉમ્યુનલ સેટિંગ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"અ‍ૅક્સેસ પૉઇન્ટમાં ફેરફાર કરો"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"સેટ નથી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a1dc27e..5cd7933 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1097,7 +1097,7 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"ईएपी तरीका"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"फ़ेज़ 2 ऑथेंटिकेशन"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA सर्टिफ़िकेट"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"प्रमाणपत्र की ऑनलाइन स्थिति"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"सर्टिफ़िकेट का ऑनलाइन स्टेटस"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"डोमेन"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"उपयोगकर्ता सर्टिफ़िकेट"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"पहचान"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> का इस्तेमाल शुरू किया जा सकता है"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"बैटरी स्‍तर"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"कम्यूनिटी"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"कम्यूनिटी सेटिंग"</string>
     <string name="apn_settings" msgid="4295467389400441299">"ऐक्सेस पॉइंट नाम"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ऐक्सेस पॉइंट में बदलाव करें"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"सेट नहीं है"</string>
@@ -3138,7 +3136,7 @@
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"बंद करें"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेंशियल स्टोरेज"</string>
     <string name="credentials_install" msgid="3933218407598415827">"कोई सर्टिफ़िकेट इंस्टॉल करें"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"मेमोरी से प्रमाणपत्र इंस्‍टॉल करें"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"स्टोरेज से सर्टिफ़िकेट इंस्‍टॉल करें"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"एसडी कार्ड से सर्टिफ़िकेट इंस्‍टॉल करें"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"क्रेडेंशियल हटाएं"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"सभी सर्टिफ़िकेट हटाएं"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 31def6f..f72ed8b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Megkezdheti a(z) <xliff:g id="NAME">^1</xliff:g> használatát"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akkumulátorszint"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Közösségi"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Közösségi beállítások"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ek"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Hozzáférési pont szerkesztése"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nincs megadva"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 168c0a5..9552689 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1531,7 +1531,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Նոր ծանուցումներ ստանալու դեպքում էկրանը կմիանա"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Միշտ ցույց տալ ժամը/տվյալները"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Մարտկոցի ավելի արագ սպառում"</string>
-    <string name="force_bold_text" msgid="4620929631102086716">"Թավ տառատեսակով տեքստ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Թավ տեքստ"</string>
     <string name="title_font_size" msgid="570613010306330622">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="8444689613442419978">"Տեքստի չափի փոփոխում"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Այժմ դուք կարող եք օգտագործել <xliff:g id="NAME">^1</xliff:g>ը"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Մարտկոցի կարգավիճակը"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Մարտկոցի մակարդակը"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ընդհանուր"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ընդհանուր կարգավորումներ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ներ"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Խմբագրել մուտքի կետը"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Կարգավորված չէ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fb32f2e..d06d69a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Anda dapat mulai menggunakan <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterai"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Tingkat baterai"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Umum"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Setelan umum"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Edit titik akses"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Tidak disetel"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 8b63e3a..7c5d63e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Þú getur byrjað að nota <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Staða rafhlöðu"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Staða rafhlöðu"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Sameiginlegt"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Sameiginlegar stillingar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Aðgangsstaðir"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Breyta aðgangsstað"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ekki stillt"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b9cffef..a6533fa 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1097,7 +1097,7 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"Metodo EAP"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Autenticazione fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificato CA"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Stato dei certificati online"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Stato del certificato online"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Dominio"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"Certificato utente"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identità"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Puoi iniziare a utilizzare la tua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stato batteria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Livello batteria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Community"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Impostazioni Community"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifica punto di accesso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nessuna impostazione"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ded997d..24f9fd1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1806,10 +1806,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"אפשר להתחיל להשתמש ב<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"טעינת סוללה:"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"שיתופי"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"הגדרות שיתופיות"</string>
     <string name="apn_settings" msgid="4295467389400441299">"‏פריטי APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"עריכת נקודת גישה"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"לא בוצעה הגדרה"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index fc2e805..ba12021 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"შეგიძლიათ, გამოიყენოთ <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ბატარეის სტატუსი"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ბატარეის დატენვის დონე"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"საერთო"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"საერთო პარამეტრები"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ები"</string>
     <string name="apn_edit" msgid="2003683641840248741">"წვდომის წერტილის რედაქტირება"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"არ არის დაყენებული"</string>
@@ -3143,7 +3141,7 @@
     <string name="credentials_reset" msgid="4246628389366452655">"ავტორიზაციის მონაცემების წაშლა"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"ყველა სერტიფიკატის წაშლა"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"საიმედო სერტიფიკატები"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"სანდო CA სერტიფიკატის ჩვენება"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"სანდო CA სერტიფიკატების ჩვენება"</string>
     <string name="user_credentials" msgid="4044405430790970775">"მომხმ. ავტორიზაციის მონაცემები"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"შენახული ავტორიზაციის მონაცემების ნახვა და შეცვლა"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"გაფართოებული"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index fbca735..8efcd69 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> пайдалануға дайын"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Батарея күйі"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Батарея деңгейі"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Жалпы"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Жалпы параметрлер"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Кіру нүктесін өзгерту"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Қойылмаған"</string>
@@ -3141,7 +3139,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Сертификаттарды қоймадан орнату"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Сертификаттарды SD картадан орнату"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"Тіркелу деректерін өшіру"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"Барлық сертификаттарды жою"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"Барлық сертификатты жою"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Сенімді тіркелу деректері"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Сенімді CA сертификаттарын көрсету"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Пайдаланушының тіркелу деректері"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index af5c554..acb7dbc 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"អ្នក​អាច​ចាប់ផ្ដើម​ប្រើប្រាស់​<xliff:g id="NAME">^1</xliff:g> របស់​អ្នក​បាន​ហើយ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ស្ថានភាព​ថ្ម"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"កម្រិត​ថ្ម"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"ទូទៅ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"ការកំណត់ទូទៅ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"កែ​ចំណុច​ចូលប្រើប្រាស់"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"មិនបានកំណត់"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 1975a89..b839447 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಬಳಸುವುದನ್ನು ನೀವು ಪ್ರಾರಂಭಿಸಬಹುದು"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ಬ್ಯಾಟರಿ ಸ್ಥಿತಿ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"ಸಮುದಾಯ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"ಸಮುದಾಯದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN ಗಳು"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ಆ್ಯಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ಹೊಂದಿಸಿಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5a8a238..f129036 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"이제 <xliff:g id="NAME">^1</xliff:g>을(를) 사용할 수 있습니다"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"배터리 상태"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"배터리 수준"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"커뮤니티"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"커뮤니티 설정"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"액세스 포인트 수정"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"설정되지 않음"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 40b8661..ceb6d53 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> колдонууга даяр"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Батареянын абалы"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Батарея деңгээли"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Жалпы"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Жалпы параметрлер"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN\'дер"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Байланыш түйүнүн өзгөртүү"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Коюлган эмес"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4f9f0a0..2e8ca2f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Galite pradėti naudodami „<xliff:g id="NAME">^1</xliff:g>“"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akumuliatoriaus lygis"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Bendruomenės"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Bendruomenės nustatymai"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redaguoti prieigos tašką"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nenustatyta"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b74392e..1b39256 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1806,10 +1806,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Varat sākt izmantot: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akumulatora uzlādes līmenis"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Kopīgie"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Kopīgie iestatījumi"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Rediģēt piekļuves punktu"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nav iestatīts"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a753759..d3c7a92 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"നിങ്ങൾക്ക് <xliff:g id="NAME">^1</xliff:g> ഉപയോഗിക്കാൻ ആരംഭിക്കാം"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ബാറ്ററി നില"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ബാറ്ററി നില"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"കമ്മ്യൂണൽ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"കമ്മ്യൂണൽ ക്രമീകരണങ്ങൾ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-കൾ"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ആക്‌സസ് പോയിന്റ് എഡിറ്റ് ചെയ്യുക"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e08f05c..b2fc1d1 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Та өөрийн <xliff:g id="NAME">^1</xliff:g>-г ашиглаж эхлэх боломжтой"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Зайны статус"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Зайны түвшин"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Нийтийн"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Нийтийн тохиргоо"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Хандалтын цэгийг засах"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Тохируулаагүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index badb410..70d7dc2 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1097,7 +1097,7 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP पद्धत"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"टप्पा 2 प्रमाणीकरण"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA प्रमाणपत्र"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ऑनलाइन प्रमाणपत्र स्थिती"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ऑनलाइन प्रमाणपत्र स्टेटस"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"डोमेन"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"वापरकर्ता प्रमाणपत्र"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ओळख"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"तुम्ही तुमचे <xliff:g id="NAME">^1</xliff:g> वापरणे सुरू करू शकता"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"बॅटरी स्थिती"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"बॅटरी पातळी"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"सामुदायिक"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"सामुदायिक सेटिंग्ज"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"अ‍ॅक्सेस पॉइंट संपादित करा"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"सेट नाही"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 398dda8..00232f5 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"သင်၏ <xliff:g id="NAME">^1</xliff:g> ကို စသုံးနိုင်ပါပြီ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ဘက်ထရီအခြေအနေ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ဘက်ထရီ အားအဆင့်"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"အများသုံး"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"အများသုံး ဆက်တင်များ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"အဝင်ပွိုင့် ပြင်ဆင်ရန်"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"သတ်မှတ်မထားပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cd3c41d..aa2e841 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Du kan begynne å bruke <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batteristatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batterinivå"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Felles"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Fellesinnstillinger"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Rediger tilgangspunkt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ikke angitt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 5a2d7bc..03e8534 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"तपाईं आफ्नो <xliff:g id="NAME">^1</xliff:g> प्रयोग गर्न थाल्न सक्नुहुन्छ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ब्याट्री स्थिति"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ब्याट्री स्तर"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"सामुदायिक"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"समुदायसम्बन्धी सेटिङ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"एक्सेस पोइन्ट सम्पादन गर्नुहोस्"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"सेट गरिएको छैन"</string>
@@ -3142,7 +3140,7 @@
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD कार्डबाट सर्टिफिकेट इन्स्टल गर्नुहोस्"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"क्रिडेन्सियल हटाउनुहोस्"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"सबै सर्टिफिकेटहरू हटाउनुहोस्"</string>
-    <string name="trusted_credentials" msgid="2522784976058244683">"विश्वस्त क्रिडेन्सियल"</string>
+    <string name="trusted_credentials" msgid="2522784976058244683">"विश्वसनीय क्रिडेन्सियल"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"विश्वस्त CA सर्टिफिकेट देखाइयोस्"</string>
     <string name="user_credentials" msgid="4044405430790970775">"प्रयोगकर्ताका क्रिडेन्सियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"भण्डारण गरिएका क्रिडेन्सियल हेर्नुहोस् र परिमार्जन गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9ede3e2..62f2bd4 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Je kunt je <xliff:g id="NAME">^1</xliff:g> gebruiken"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batterijstatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Accuniveau"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Gemeenschappelijk"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Gemeenschappelijke instellingen"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN\'s"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Toegangspunt bewerken"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Niet ingesteld"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ea00e84..50d0c48 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -330,7 +330,7 @@
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"ଲୋକେସନ ସେଟିଂସ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ।"</string>
     <string name="account_settings_title" msgid="9138880127246241885">"ଆକାଉଣ୍ଟ"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"ସୁରକ୍ଷା"</string>
-    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ଏନକ୍ରିପ୍ସନ୍‌ ଓ କ୍ରେଡେନସିଆଲ୍‌"</string>
+    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ଏନକ୍ରିପ୍ସନ ଓ କ୍ରେଡେନସିଆଲ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ଫୋନ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି"</string>
     <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ଫୋନକୁ ଏନକ୍ରିପ୍ଟ କରାଯାଇନାହିଁ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ଡିଭାଇସ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି"</string>
@@ -1096,8 +1096,8 @@
     <string name="passpoint_content" msgid="5219226173518418335">"<xliff:g id="NAME">%1$s</xliff:g> କ୍ରେଡେନ୍ସିଆଲ୍‌"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP ପଦ୍ଧତି"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"2ୟ ପର୍ଯ୍ୟାୟ ପ୍ରମାଣୀକରଣ"</string>
-    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA ସାର୍ଟିଫିକେଟ୍‌"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ଅନ୍‍ଲାଇନ୍ ସାର୍ଟିଫିକେଟ୍ ସ୍ଥିତି"</string>
+    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA ସାର୍ଟିଫିକେଟ"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ଅନଲାଇନ ସାର୍ଟିଫିକେଟ ସ୍ଥିତି"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"ଡୋମେନ୍"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"ଉପଯୋଗକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ୍‌"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ପରିଚୟ"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ଆପଣ ଆପଣଙ୍କ <xliff:g id="NAME">^1</xliff:g> ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିପାରିବେ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ବ୍ୟାଟେରୀ ସ୍ଥିତି"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ବ୍ୟାଟେରୀ ସ୍ତର"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"କମ୍ୟୁନାଲ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"କମ୍ୟୁନାଲ ସେଟିଂସ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ଆକ୍ସେସ ପଏଣ୍ଟକୁ ଏଡିଟ କରନ୍ତୁ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ସେଟ ହୋଇନାହିଁ"</string>
@@ -3136,15 +3134,15 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ଆପଣଙ୍କ ନେଟୱାର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ପରିଚାଳନା କରି ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଏ ଏବଂ ଡିଭାଇସର କାର୍ଯ୍ୟଦକ୍ଷତାକୁ ଉନ୍ନତ କରେ"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"ଚାଲୁ ଅଛି"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"ବନ୍ଦ ଅଛି"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"କ୍ରେଡେନ୍ସିଆଲ୍ ଷ୍ଟୋରେଜ୍"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"କ୍ରେଡେନ୍ସିଆଲ ଷ୍ଟୋରେଜ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ଏକ ସାର୍ଟିଫିକେଟ୍ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ଷ୍ଟୋରେଜ୍‌ରୁ ସାର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD କାର୍ଡରୁ ସର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"କ୍ରେଡେନସିଆଲ୍ ଖାଲି କରିଦିଅନ୍ତୁ"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"ସବୁ ସାର୍ଟିଫିକେଟ୍ କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="trusted_credentials" msgid="2522784976058244683">"ବିଶ୍ୱସନୀୟ କ୍ରେଡେନସିଆଲ୍‌"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"ବିଶ୍ୱସ୍ତ CA ସାର୍ଟିଫିକେଟ୍‌ ଡିସପ୍ଲେ କରନ୍ତୁ"</string>
-    <string name="user_credentials" msgid="4044405430790970775">"ଉପଯୋଗକର୍ତ୍ତା କ୍ରେଡେନସିଆଲ୍"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"କ୍ରେଡେନସିଆଲ ଖାଲି କରିଦିଅନ୍ତୁ"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"ସବୁ ସାର୍ଟିଫିକେଟକୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="trusted_credentials" msgid="2522784976058244683">"ବିଶ୍ୱସ୍ତ କ୍ରେଡେନସିଆଲ"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"ବିଶ୍ୱସ୍ତ CA ସାର୍ଟିଫିକେଟ ଡିସପ୍ଲେ କରନ୍ତୁ"</string>
+    <string name="user_credentials" msgid="4044405430790970775">"ୟୁଜର କ୍ରେଡେନସିଆଲ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ଷ୍ଟୋର୍ କରାଯାଇଥିବା କ୍ରେଡେନ୍ସିଆଲକୁ ଦେଖି ଏହାକୁ ବଦଳାନ୍ତୁ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ଉନ୍ନତ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 835657c..e01ee8b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ਤੁਸੀਂ ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਦੀ ਵਰਤੋਂ ਸ਼ੁਰੂ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ਬੈਟਰੀ ਸਥਿਤੀ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ਬੈਟਰੀ ਪੱਧਰ"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"ਭਾਈਚਾਰਕ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"ਭਾਈਚਾਰਕ ਸੈਟਿੰਗਾਂ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ਪਹੁੰਚ ਬਿੰਦੂ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 45a881e..44386e6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Możesz zacząć używać nośnika <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stan baterii"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Poziom naładowania baterii"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Wspólne"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Wspólne ustawienia"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Nazwy APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Edytuj punkt dostępu"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nie ustawiono"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ac46a06..00b3c50 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Você já pode usar o <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status da bateria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nível da bateria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Compartilhadas"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configurações compartilhadas"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar ponto de acesso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sem definição"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ac46a06..00b3c50 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Você já pode usar o <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status da bateria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nível da bateria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Compartilhadas"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configurações compartilhadas"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar ponto de acesso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sem definição"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 789786f..451622c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1806,10 +1806,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Poți începe să folosești <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stare baterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivelul bateriei"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comune"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Setări comune"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Nume APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifică punctul de acces"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nesetat(ă)"</string>
@@ -3174,11 +3172,11 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extinde autonomia bateriei și îmbunătățește performanța dispozitivului, gestionând automat conexiunile la rețea"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Activată"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Dezactivată"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"Stocarea certificatelor"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"Stocarea datelor de conectare"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalează un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalează certificate de pe stocare"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Instalează certificate de pe cardul SD"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"Șterge acreditările"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"Șterge datele de conectare"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Elimină toate certificatele"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Date de conectare de încredere"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Afișează certificatele CA de încredere"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7660076..177c002 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Теперь вы можете использовать устройство \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Уровень заряда батареи"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Совместные"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Совместные настройки"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Точки доступа"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Изменить точку доступа"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не задано"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index fc59abb..9a03c57 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ඔබට ඔබේ <xliff:g id="NAME">^1</xliff:g> භාවිතය ආරම්භ කළ හැක"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"බැටරි තත්වය"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"බැටරි මට්ටම"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"වාර්ගික"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"වාර්ගික සැකසීම්"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ප්‍රවේශ ස්ථානය සංස්කරණය"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"පිහිටුවා නැත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 31fd294..e122ae8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> môžete začať používať"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stav batérie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nabitie batérie"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Spoločné"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Spoločné nastavenia"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Prístupové body"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Upraviť prístupový bod"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nenastavené"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 42fe2ec..aa5320c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -688,7 +688,7 @@
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, odstrani"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Šifriranje"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifriraj tablični računalnik"</string>
-    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriraj telefon"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriranje telefona"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Šifrirano"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Nastavitev zaklepanja zaslona"</string>
     <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Za večjo varnost nastavite kodo PIN, vzorec ali geslo za to napravo."</string>
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Shrambo <xliff:g id="NAME">^1</xliff:g> lahko začnete uporabljati"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Raven napolnjenosti baterije"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Skupno"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Skupne nastavitve"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ji"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Urejanje dostopne točke"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ni nastavljeno"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 489e923..2fb9137 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Mund të fillosh të përdorësh <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Statusi i baterisë"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Niveli i baterisë"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Të përbashkëta"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Cilësimet e përbashkëta"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-të"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redakto pikën e qasjes"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nuk është caktuar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3e67f5c..0fd19af 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -684,7 +684,7 @@
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Да, уклони"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Шифровање"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Шифруј таблет"</string>
-    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифруј телефон"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифровање телефона"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Шифровано"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Подесите закључавање екрана"</string>
     <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Да бисте побољшали безбедност, подесите PIN, шаблон или лозинку за овај уређај"</string>
@@ -1806,10 +1806,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Можете да почнете да користите: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Статус батерије"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Ниво батерије"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Заједничко"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Заједничка подешавања"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Називи приступних тачака"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Измена приступне тачке"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Није подешено"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7cdb118..019283d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Du kan börja använda <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batteristatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batterinivå"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Allmänt"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Allmänna inställningar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN:er"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redigera åtkomstpunkt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ej fastställt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8208e3f..1462415 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Unaweza kuanza kutumia <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Hali ya betri"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Kiwango cha betri"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ya jumuiya"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Mipangilio ya jumuiya"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Badilisha mahali pa kufikia"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Haijawekwa"</string>
@@ -5496,8 +5494,7 @@
     <string name="mobile_data_usage_title" msgid="2047864499317759728">"Programu zinavyotumia data"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"Hali ya Mtandao Isiyo sahihi <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Puuza"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Majina ya Milango ya Mtandao"</string>
-    <!-- no translation found for keywords_access_point_names (8174967126858505945) -->
-    <skip />
+    <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Angalia zaidi"</string>
     <string name="see_less" msgid="2642392725363552793">"Angalia chache"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 97027a1..1c19c1b 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"உங்கள் <xliff:g id="NAME">^1</xliff:g> ஐப் பயன்படுத்தத் தொடங்கலாம்"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"பேட்டரி நிலை"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"சமூகம்"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"சமூக அமைப்புகள்"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN பட்டியல்"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ஆக்சஸ் பாயிண்ட்டைத் திருத்து"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"அமைக்கப்படவில்லை"</string>
@@ -3141,7 +3139,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"சேமிப்பிடத்திலிருந்து சான்றிதழ்களை நிறுவலாம்"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD கார்டிலிருந்து சான்றிதழ்களை நிறுவு"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"அனுமதிச் சான்றுகளை அழி"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"எல்லா சான்றிதழ்களையும் அகற்று"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"எல்லா சான்றிதழ்களையும் அகற்றும்"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"நம்பிக்கைச் சான்றுகள்"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"நம்பகமான CA சான்றிதழ்களைக் காட்டும்"</string>
     <string name="user_credentials" msgid="4044405430790970775">"பயனரின் அனுமதிச் சான்றுகள்"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a3b983d..44deabc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Magagamit mo na ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status ng baterya"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Antas ng baterya"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Communal"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Mga communal setting"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Mga APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"I-edit ang access point"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Hindi nakatakda"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f780cd0..2a44178 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1039,7 +1039,7 @@
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Herkese açık yüksek kaliteli ağlara otomatik olarak bağlan"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Bu özelliği kullanmak için ağ derecelendirme sağlayıcısı seçin"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Bu özelliği kullanmak için uygun bir ağ derecelendirme sağlayıcısı seçin"</string>
-    <string name="wifi_install_credentials" msgid="5192903644606839972">"Sertifika yükle"</string>
+    <string name="wifi_install_credentials" msgid="5192903644606839972">"Sertifika yükleme"</string>
     <string name="wifi_scan_notify_text" msgid="7163137260385995873">"Uygulamalar ve hizmetler, konum doğruluğunu iyileştirmek için kablosuz ağları kablosuz özelliği kapalıyken bile her zaman tarayabilir. Bu özellik örneğin konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir. Bunu <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Kablosuz ağ taraması ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Konum doğruluğunu iyileştirmek için <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>kablosuz ağ taraması ayarlarında<xliff:g id="LINK_END_1">LINK_END</xliff:g> kablosuz ağ taramasını açın."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Bir daha gösterme"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> biriminizi kullanmaya başlayabilirsiniz"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Pil durumu"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Pil düzeyi"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ortak"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ortak ayarlar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN\'ler"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Erişim noktasını düzenle"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ayarlanmadı"</string>
@@ -3137,11 +3135,11 @@
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Açık"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Kapalı"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kimlik bilgileri deposu"</string>
-    <string name="credentials_install" msgid="3933218407598415827">"Sertifika yükle"</string>
+    <string name="credentials_install" msgid="3933218407598415827">"Sertifika yükleme"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikaları depolama biriminden yükleyin"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Sertifikaları SD karttan yükle"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"Kimlik bilgilerini temizle"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"Tüm sertifikaları kaldır"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"Kimlik bilgilerini temizleme"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"Tüm sertifikaları kaldırın"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Güvenilen kimlik bilgileri"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Güvenilen CA sertifikalarını görüntüleyin"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Kullanıcı kimlik bilgileri"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 81f1845..8565d3f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1827,10 +1827,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g>: готово до використання"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Стан акумулятора"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Рівень заряду акумулятора"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Для спільного використання"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Налаштування для спільного використання"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Точки доступу"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Змінити точку доступу"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не встановлено"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3c9baf2..aeed75d 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"آپ اپنے <xliff:g id="NAME">^1</xliff:g> کا استعمال شروع کر سکتے ہیں"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"بیٹری کا اسٹیٹس"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"بیٹری کی سطح"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"کمیونل"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"کمیونل ترتیبات"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"رسائی کے مقام میں ترمیم کریں"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"سیٹ نہيں ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 8e5e802..ea1fabe 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> omboringizdan foydalanishni boshlang"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batareya holati"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batareya quvvati darajasi"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Umumiy"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Umumiy sozlamalar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Ulanish nuqtasini tahrirlash"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Kiritilmagan"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1567e97..b00a723 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -342,7 +342,7 @@
     <string name="security_passwords_title" msgid="4154420930973818581">"Quyền riêng tư"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Không có sẵn"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Trạng thái bảo mật"</string>
-    <string name="security_dashboard_summary" msgid="7571035662779425918">"Phương thức khóa màn hình, Tìm thiết bị, bảo mật ứng dụng"</string>
+    <string name="security_dashboard_summary" msgid="7571035662779425918">"Phương thức khóa màn hình, Tìm thiết bị của tôi, bảo mật ứng dụng"</string>
     <string name="safety_center_title" msgid="7732397372178774777">"Bảo mật và quyền riêng tư"</string>
     <string name="safety_center_summary" msgid="3554867379951053869">"Bảo mật ứng dụng, khoá thiết bị, quyền"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Đã thêm khuôn mặt"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Bạn có thể bắt đầu sử dụng <xliff:g id="NAME">^1</xliff:g> của mình"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Mức pin"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Dùng chung"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Các chế độ cài đặt dùng chung"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Chỉnh sửa điểm truy cập"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Chưa đặt"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 7b68493..e00210d 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -105,7 +105,7 @@
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
   <string-array name="eap_ocsp_type">
-    <item msgid="8568170800958331461">"不要验证"</item>
+    <item msgid="8568170800958331461">"不验证"</item>
     <item msgid="5703177653586269306">"要求证书状态（非强制）"</item>
     <item msgid="326388247868439528">"需要证书状态"</item>
   </string-array>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5d23120..4f6062d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"您可以开始使用<xliff:g id="NAME">^1</xliff:g>了"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"电池状态"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"电池电量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共用"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共用设置"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"修改接入点"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未设置"</string>
@@ -3141,7 +3139,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"从存储设备安装证书"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"从SD卡安装证书"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"清除凭据"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"删除所有证书"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"移除所有证书"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"显示信任的 CA 证书"</string>
     <string name="user_credentials" msgid="4044405430790970775">"用户凭据"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e296042..07c19c6 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1786,10 +1786,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"您可以開始使用 <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"電池狀態"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"電量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共用"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共用設定"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"編輯接入點"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未設定"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b90694e..e17b13c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1119,9 +1119,9 @@
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"已隨機化的 MAC"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="6141246783457722976">"新增裝置"</string>
     <string name="wifi_dpp_center_qr_code" msgid="5270782275746178104">"將下面的視窗對準 QR 圖碼，即可將這個裝置新增至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
-    <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"掃描 QR 圖碼"</string>
+    <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"掃描 QR code"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"將 QR 圖碼置於相機正下方即可連線到「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃描 QR 圖碼即可加入 Wi‑Fi"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃描 QR code 即可加入 Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 Wi-Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他裝置掃描這個 QR 圖碼即可加入「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"你可以開始使用 <xliff:g id="NAME">^1</xliff:g> 了"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"電池狀態"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"電池電量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共通"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共通設定"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"編輯存取點"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未設定"</string>
@@ -5910,7 +5908,7 @@
     <string name="bluetooth_find_broadcast_summary" msgid="3907899428626210673">"正在收聽"</string>
     <string name="bluetooth_find_broadcast" msgid="1768337775649457586">"尋找廣播"</string>
     <string name="bluetooth_find_broadcast_button_leave" msgid="7881206581147104908">"離開廣播"</string>
-    <string name="bluetooth_find_broadcast_button_scan" msgid="3995664694641895189">"掃描 QR 圖碼"</string>
+    <string name="bluetooth_find_broadcast_button_scan" msgid="3995664694641895189">"掃描 QR code"</string>
     <string name="find_broadcast_password_dialog_title" msgid="3176988702535737484">"輸入密碼"</string>
     <string name="find_broadcast_password_dialog_connection_error" msgid="47873617983439400">"無法連線，請再試一次。"</string>
     <string name="find_broadcast_password_dialog_password_error" msgid="243855327674765">"密碼錯誤"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a935ae..b77551f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1785,10 +1785,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Ungaqala ukusebenzisa i-<xliff:g id="NAME">^1</xliff:g> yakho"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Umumo webhethri"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Izinga lebhethri"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Okomphakathi"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Amasethingi omphakathi"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Hlela indawo yokungena"</string>
     <!-- unknown quoting pattern: original -1, translation 1 -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29130eb..28b35b3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1628,7 +1628,11 @@
     <!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
     <string name="fingerprint_unlock_skip_fingerprint">Continue without fingerprint</string>
     <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
-    <string name="fingerprint_unlock_title">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
+    <string name="fingerprint_unlock_title" product="default">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_unlock_title" product="tablet">You can unlock your tablet using your fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_unlock_title" product="device">You can unlock your device using your fingerprint. For security, this option requires a backup screen lock.</string>
 
     <!-- Title for preference that guides the user through creating a backup unlock pattern for Face Unlock [CHAR LIMIT=45]-->
     <string name="face_unlock_set_unlock_pattern">Face Unlock + Pattern</string>
@@ -1639,7 +1643,11 @@
     <!-- Title for preference that guides the user to skip Face Unlock setup [CHAR LIMIT=60]-->
     <string name="face_unlock_skip_face">Continue without Face Unlock</string>
     <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
-    <string name="face_unlock_title">You can unlock your phone using your face. For security, this option requires a backup screen lock.</string>
+    <string name="face_unlock_title" product="default">You can unlock your phone using your face. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
+    <string name="face_unlock_title" product="tablet">You can unlock your tablet using your face. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
+    <string name="face_unlock_title" product="device">You can unlock your device using your face. For security, this option requires a backup screen lock.</string>
 
     <!-- Title for preference that guides the user through creating a backup unlock pattern for biometrics unlock [CHAR LIMIT=45]-->
     <string name="biometrics_unlock_set_unlock_pattern">Pattern \u2022 Face \u2022 Fingerprint</string>
@@ -1650,7 +1658,11 @@
     <!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
     <string name="biometrics_unlock_skip_biometrics">Continue without face or fingerprint</string>
     <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
-    <string name="biometrics_unlock_title">You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.</string>
+    <string name="biometrics_unlock_title" product="default">You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
+    <string name="biometrics_unlock_title" product="tablet">You can unlock your tablet using your face or fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
+    <string name="biometrics_unlock_title" product="device">You can unlock your device using your face or fingerprint. For security, this option requires a backup screen lock.</string>
 
     <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
     <string name="unlock_set_unlock_disabled_summary">Disabled by admin, encryption policy, or
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 778ee5c..89bda20 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -73,6 +73,7 @@
     private int mPreviousRotation = 0;
     private ScreenSizeFoldProvider mScreenSizeFoldProvider;
     private boolean mIsFolded;
+    private boolean mIsReverseDefaultRotation;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -120,6 +121,8 @@
         } else if (mCanAssumeSfps) {
             setHeaderText(R.string.security_settings_sfps_enroll_find_sensor_title);
             setDescriptionText(R.string.security_settings_sfps_enroll_find_sensor_message);
+            mIsReverseDefaultRotation = getApplicationContext().getResources().getBoolean(
+                    com.android.internal.R.bool.config_reverseDefaultRotation);
         } else {
             setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
             setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message);
@@ -175,11 +178,20 @@
         }
     }
 
+    private int getRotationFromDefault(int rotation) {
+        if (mIsReverseDefaultRotation) {
+            return (rotation + 1) % 4;
+        } else {
+            return rotation;
+        }
+    }
+
     private void updateSfpsFindSensorAnimationAsset() {
         mScreenSizeFoldProvider
                 .onConfigurationChange(getApplicationContext().getResources().getConfiguration());
         mIllustrationLottie = findViewById(R.id.illustration_lottie);
-        final int rotation = getApplicationContext().getDisplay().getRotation();
+        final int rotation = getRotationFromDefault(
+                getApplicationContext().getDisplay().getRotation());
 
         switch (rotation) {
             case Surface.ROTATION_90:
@@ -441,7 +453,7 @@
         mOrientationEventListener = new OrientationEventListener(this) {
             @Override
             public void onOrientationChanged(int orientation) {
-                final int currentRotation = getDisplay().getRotation();
+                final int currentRotation = getRotationFromDefault(getDisplay().getRotation());
                 if ((currentRotation + 2) % 4 == mPreviousRotation) {
                     mPreviousRotation = currentRotation;
                     recreate();
@@ -449,7 +461,7 @@
             }
         };
         mOrientationEventListener.enable();
-        mPreviousRotation = getDisplay().getRotation();
+        mPreviousRotation = getRotationFromDefault(getDisplay().getRotation());
     }
 
     private void stopListenOrientationEvent() {
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 71c532c..4e08f98 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -20,10 +20,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -39,6 +39,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,7 +49,6 @@
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 @RunWith(RobolectricTestRunner.class)
 public final class AppWithAdminGrantedPermissionsCounterTest {
@@ -129,7 +129,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
                 eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).getInstallReason(any(), any());
+        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
         verifyNoMoreInteractions(mPackageManager);
     }
 
@@ -166,9 +166,9 @@
     }
 
     private void configureInstallTimePermissions() throws RemoteException {
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -178,9 +178,9 @@
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
                 .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
     }
 
@@ -189,15 +189,15 @@
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
         when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 9a4978b..a818637 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -20,10 +20,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -122,19 +122,19 @@
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
         when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
 
         // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -144,7 +144,7 @@
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
                 .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
 
         // app3 and app5 were installed by enterprise policy.
@@ -168,11 +168,11 @@
                 buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M)));
 
         // Grant run-time permissions as appropriate.
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
 
         // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
 
         // app6 was not installed by enterprise policy.
@@ -202,7 +202,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
                 eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).getInstallReason(any(), any());
+        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
         verifyNoMoreInteractions(mPackageManager);
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index 602d678..e2aed36 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -20,11 +20,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.argThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -170,7 +170,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID));
         verify(mPackageManager, atLeast(0))
-            .queryIntentActivitiesAsUser(any(), anyInt(), anyInt());
+            .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt());
     }
 
     public static boolean checkAppFound(List<UserAppInfo> mInstalledAppList, String appId,
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index da5ada7..e0a0836 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 178a26f..3e46027 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.Manifest;
@@ -142,6 +142,6 @@
 
         controller.getSettingIntent(null);
 
-        verifyNoInteractions(assistUtils);
+        verifyZeroInteractions(assistUtils);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index ee6ae22..b899206 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -25,11 +25,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index 81f4859..fac8b58 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -21,8 +21,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 37b8ab6..f2b0acd 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -40,7 +40,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -268,7 +268,7 @@
         mImpl.bindPreferenceToTileAndGetObservers(mActivity, mFragment, mForceRoundedIcon,
                 null /* keys */, tile, "123", Preference.DEFAULT_ORDER);
 
-        verifyNoInteractions(tile);
+        verifyZeroInteractions(tile);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index e7b59a3..bccec3e 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -19,14 +19,14 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index cef5928..861b4e3 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -19,15 +19,16 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -132,9 +133,9 @@
                 mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning);
 
         doReturn("some-string").when(billingCycleSettings).getString(anyInt(), anyInt());
-        when(mNetworkPolicyEditor.getPolicyCycleDay(any())).thenReturn(CYCLE_NONE + 1);
-        when(mNetworkPolicyEditor.getPolicyLimitBytes(any())).thenReturn(2000L);
-        when(mNetworkPolicyEditor.getPolicyWarningBytes(any())).thenReturn(1000L);
+        when(mNetworkPolicyEditor.getPolicyCycleDay(anyObject())).thenReturn(CYCLE_NONE + 1);
+        when(mNetworkPolicyEditor.getPolicyLimitBytes(anyObject())).thenReturn(2000L);
+        when(mNetworkPolicyEditor.getPolicyWarningBytes(anyObject())).thenReturn(1000L);
 
         billingCycleSettings.updatePrefs();
 
diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
index 4391425..70a1a38 100644
--- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index 9fb364e..b9c4edc 100644
--- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.time.Capabilities;
@@ -99,7 +99,7 @@
         mController.setChecked(true);
 
         // Verify the TimeManager was not called.
-        verifyNoInteractions(mTimeManager);
+        verifyZeroInteractions(mTimeManager);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
index 35e044c..3f49b15 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
@@ -23,8 +23,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 06e4107..09d1c84 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -18,10 +18,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -79,7 +79,7 @@
             }
         }).when(mFeatureFactory.applicationFeatureProvider)
                 .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions),
-                        eq(async), any());
+                        eq(async), anyObject());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index c32d2d7..f39b4b8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
@@ -74,7 +74,7 @@
                 return null;
             }
         }).when(mFeatureFactory.applicationFeatureProvider)
-                .calculateNumberOfPolicyInstalledApps(eq(async), any());
+                .calculateNumberOfPolicyInstalledApps(eq(async), anyObject());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 8c65086..90e8caf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -30,7 +30,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.AppOpsManager;
@@ -859,7 +859,7 @@
         mFragment.onRadioButtonClicked(mOptimizePreference);
         mFragment.onPause();
 
-        verifyNoInteractions(mMetricsFeatureProvider);
+        verifyZeroInteractions(mMetricsFeatureProvider);
     }
 
     @Test
@@ -870,7 +870,7 @@
 
         mFragment.notifyBackupManager();
 
-        verifyNoInteractions(mBackupManager);
+        verifyZeroInteractions(mBackupManager);
     }
 
     @Test
@@ -893,6 +893,6 @@
 
         mFragment.onPause();
 
-        verifyNoInteractions(mBackupManager);
+        verifyZeroInteractions(mBackupManager);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
index 55ff93b..283df7b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
@@ -34,7 +34,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.AppOpsManager;
 import android.app.backup.BackupDataInputStream;
@@ -254,7 +254,7 @@
 
         mBatteryBackupHelper.restoreEntity(mBackupDataInputStream);
 
-        verifyNoInteractions(mBackupDataInputStream);
+        verifyZeroInteractions(mBackupDataInputStream);
     }
 
     @Test
@@ -292,13 +292,13 @@
     @Test
     public void restoreOptimizationMode_nullBytesData_skipRestore() throws Exception {
         mBatteryBackupHelper.restoreOptimizationMode(new byte[0]);
-        verifyNoInteractions(mBatteryOptimizeUtils);
+        verifyZeroInteractions(mBatteryOptimizeUtils);
 
         mBatteryBackupHelper.restoreOptimizationMode("invalid data format".getBytes());
-        verifyNoInteractions(mBatteryOptimizeUtils);
+        verifyZeroInteractions(mBatteryOptimizeUtils);
 
         mBatteryBackupHelper.restoreOptimizationMode(DELIMITER.getBytes());
-        verifyNoInteractions(mBatteryOptimizeUtils);
+        verifyZeroInteractions(mBatteryOptimizeUtils);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 78534e1..6389dc9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
@@ -267,7 +267,7 @@
 
         mController.updateHeaderByBatteryTips(null, mBatteryInfo);
 
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
+        verifyZeroInteractions(mBatteryUsageProgressBarPref);
     }
 
     @Test
@@ -277,7 +277,7 @@
 
         mController.updateHeaderByBatteryTips(lowBatteryTip, null);
 
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
+        verifyZeroInteractions(mBatteryUsageProgressBarPref);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index f92c322..b223d0b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -25,16 +25,16 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.AppOpsManager;
@@ -183,8 +183,8 @@
         mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED);
         TimeUnit.SECONDS.sleep(1);
 
-        verifyNoInteractions(mMockBackend);
-        verifyNoInteractions(mMockBatteryUtils);
+        verifyZeroInteractions(mMockBackend);
+        verifyZeroInteractions(mMockBatteryUtils);
     }
 
     @Test
@@ -247,7 +247,7 @@
                 AppOpsManager.MODE_ALLOWED, /* allowListed */ false,
                 /* isSystemOrDefaultApp */ false);
 
-        verifyNoInteractions(mMockBatteryUtils);
+        verifyZeroInteractions(mMockBatteryUtils);
 
         final InOrder inOrder = inOrder(mMockBackend);
         inOrder.verify(mMockBackend).refreshList();
@@ -261,7 +261,7 @@
                 AppOpsManager.MODE_ALLOWED, /* allowListed */ true,
                 /* isSystemOrDefaultApp */ true);
 
-        verifyNoInteractions(mMockBatteryUtils);
+        verifyZeroInteractions(mMockBatteryUtils);
 
         final InOrder inOrder = inOrder(mMockBackend);
         inOrder.verify(mMockBackend).refreshList();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java
index 5815bae..da397fd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
index 151b8ae..9fbcb16 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
@@ -18,9 +18,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyFloat;
-import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index 07a5504..683f0fd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -17,10 +17,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 
 import android.content.ContentValues;
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 9aa79ff..bafc021 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -16,15 +16,16 @@
 
 package com.android.settings.network;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import android.app.admin.DevicePolicyManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
@@ -161,7 +162,7 @@
 
         mController.onResume();
 
-        verifyNoInteractions(mPreference);
+        verifyZeroInteractions(mPreference);
 
         Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
 
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
index 3791c23..1660955 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
@@ -43,10 +42,10 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.internal.util.reflection.FieldSetter;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -193,26 +192,16 @@
         rule.setEnabled(false);
         rMap.put(testId, rule);
         mockGetAutomaticZenRules(NUM_RULES, rMap);
-        setZenRulePreferenceField("mId", testId);
+        FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId);
         mController.updateState(mockPref);
         verify(mZenRulePreference, times(1)).updatePreference(any());
         verify(mockPref, never()).removeAll();
         assertEquals(NUM_RULES, mController.mZenRulePreferences.size());
     }
 
-    private void setZenRulePreferenceField(String name, Object value) {
-        try {
-            Field field = ZenRulePreference.class.getDeclaredField("mId");
-            field.setAccessible(true);
-            field.set(mZenRulePreference, value);
-        } catch (ReflectiveOperationException e) {
-            fail("Unable to set mZenRulePreference field: " + name);
-        }
-    }
-
     private void mockGetAutomaticZenRules(int numRules, Map<String, AutomaticZenRule> rules) {
         Map.Entry<String, AutomaticZenRule>[] arr = new Map.Entry[numRules];
         rules.entrySet().toArray(arr);
         when(mBackend.getAutomaticZenRules()).thenReturn(arr);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
index d5834f9..6bf0538 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -146,4 +146,4 @@
         }
         return null;
     }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
index c431c53..99fa8e6 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
@@ -30,8 +30,8 @@
 import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY_NONE;
 import static com.android.settings.notification.zen.ZenPrioritySendersHelper.UNKNOWN;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
index 01f3dfa..2f7dfe7 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java
index b5d07cc..96036d5 100644
--- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java
@@ -21,8 +21,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -72,7 +72,7 @@
         mPreference = new Preference(mContext);
         when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager);
         when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager);
-        when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob);
+        when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob);
         when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo);
         mController = new PrintJobMessagePreferenceController(mContext, PREF_KEY);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -93,7 +93,7 @@
 
     @Test
     public void updateUi_visiblePreference() {
-        when(mPrintJobInfo.getStatus(any())).thenReturn("TestPrint");
+        when(mPrintJobInfo.getStatus(anyObject())).thenReturn("TestPrint");
         mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(mPreference.isVisible()).isTrue();
@@ -103,7 +103,7 @@
 
     @Test
     public void updateUi_invisiblePreference() {
-        when(mPrintJobInfo.getStatus(any())).thenReturn(null);
+        when(mPrintJobInfo.getStatus(anyObject())).thenReturn(null);
         mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(mPreference.isVisible()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
index da4d58c..09c5bf3 100644
--- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
@@ -21,8 +21,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -75,7 +75,7 @@
         mTestLabel = "PrintTest";
         when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager);
         when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager);
-        when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob);
+        when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob);
         when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo);
         mController = new PrintJobPreferenceController(mContext, PREF_KEY);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
index 2a7bd29..c646a93 100644
--- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.settings.SettingsEnums;
@@ -91,7 +91,7 @@
 
         SearchMenuController.init(mHost);
         mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
-        verifyNoInteractions(mMenu);
+        verifyZeroInteractions(mMenu);
     }
 
     @Test
@@ -100,7 +100,7 @@
         SearchMenuController.init(mHost);
         mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
 
-        verifyNoInteractions(mMenu);
+        verifyZeroInteractions(mMenu);
     }
 
     @Test
@@ -112,6 +112,6 @@
 
         mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
 
-        verifyNoInteractions(mMenu);
+        verifyZeroInteractions(mMenu);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index e297b78..62c7bd8 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -26,7 +26,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -111,7 +111,7 @@
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false);
         mAdapter.requestHighlight(mRoot, null /* recyclerView */,  mock(AppBarLayout.class));
 
-        verifyNoInteractions(mRoot);
+        verifyZeroInteractions(mRoot);
     }
 
     @Test
@@ -125,7 +125,7 @@
         when(mFragment.getArguments()).thenReturn(null);
         when(mFragment.getPreferenceScreen()).thenReturn(screen);
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
-        verifyNoInteractions(screen);
+        verifyZeroInteractions(screen);
     }
 
     @Test
@@ -150,7 +150,7 @@
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
 
         verify(mFragment).getInitialExpandedChildCount();
-        verifyNoInteractions(screen);
+        verifyZeroInteractions(screen);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index e5b13c4..e4d3982 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -195,7 +195,7 @@
     }
 
     private List<WifiEntry> createWifiEntryList() {
-        List<WifiEntry> wifiEntryList = new ArrayList<>();
+        List<WifiEntry> wifiEntryList = spy(new ArrayList<>());
 
         final WifiEntry wifiEntry1 = mock(WifiEntry.class);
         when(wifiEntry1.getSsid()).thenReturn("Test AP 1");
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
index 610e520..8478a54 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
@@ -21,9 +21,9 @@
 import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
         .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -75,7 +75,7 @@
         mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */));
         mDisclaimerItemList.add(mDisclaimerItem);
 
-        when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView);
+        when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView);
         when(mViewGroup.getContext()).thenReturn(mContext);
         when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn(
                 mLayoutInflater);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
index c8e4cce..985edda 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
@@ -18,8 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
index 148095a..3fe9678 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
@@ -18,8 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
index 0ece537..207a231 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
@@ -16,9 +16,10 @@
 
 package com.android.settings.wifi.calling;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
@@ -94,7 +95,7 @@
 
         doReturn(mActivity).when(mFragment).getActivity();
 
-        when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView);
+        when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView);
         when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton);
         when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton);
         when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index 1faa611..e2c5ca3 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -16,17 +16,17 @@
 
 package com.android.settings.wifi.calling;
 
+import static junit.framework.Assert.assertEquals;
+
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.assertEquals;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -44,6 +44,7 @@
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsMmTelManager;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index c86a023..274ac16 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -17,16 +17,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -94,6 +93,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InOrder;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -1255,7 +1255,7 @@
         mMockWifiConfig.creatorUid = doUid;
         ComponentName doComponent = new ComponentName(doPackage, "some.Class");
         try {
-            when(mMockPackageManager.getPackageUidAsUser(anyString(), anyInt()))
+            when(mMockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt()))
                     .thenReturn(doUid);
         } catch (PackageManager.NameNotFoundException e) {
             //do nothing