diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ab27e6..059278d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -806,6 +806,10 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.PERSONALIZE" />
+            </intent-filter>
             <meta-data android:name="com.android.settings.title"
                        android:resource="@string/wallpaper_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index bb7e295..0b673b8 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -23,99 +23,105 @@
     android:layout="@layout/suw_glif_blank_template"
     style="?attr/fingerprint_layout_theme">
 
-    <LinearLayout
-        style="@style/SuwContentFrame"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:clipToPadding="false"
-        android:clipChildren="false">
+        android:fillViewport="true">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipChildren="false"
+            android:orientation="horizontal"
             android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <ImageView
-                android:id="@+id/suw_layout_icon"
-                style="@style/SuwGlifIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"
-                android:contentDescription="@null"
-                android:src="@drawable/ic_fingerprint_header"/>
-
-            <TextView
-                android:id="@+id/suw_layout_title"
-                style="@style/SuwGlifHeaderTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"/>
-
-            <TextView
-                android:id="@+id/message"
-                style="@style/SuwDescription.Glif"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+            android:clipChildren="false">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
                 android:clipChildren="false"
                 android:clipToPadding="false"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <Button
-                    style="@style/SetupWizardButton.Negative"
-                    android:id="@+id/add_another_button"
+                <ImageView
+                    android:id="@+id/suw_layout_icon"
+                    style="@style/SuwGlifIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:text="@string/fingerprint_enroll_button_add" />
+                    android:layout_gravity="?attr/suwGlifHeaderGravity"
+                    android:layout_marginLeft="0dp"
+                    android:layout_marginRight="0dp"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_fingerprint_header"/>
+
+                <TextView
+                    android:id="@+id/suw_layout_title"
+                    style="@style/SuwGlifHeaderTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="0dp"
+                    android:layout_marginRight="0dp"/>
+
+                <TextView
+                    android:id="@+id/message"
+                    style="@style/SuwDescription.Glif"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
                 <Space
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:layout_weight="1" />
 
-                <Button
-                    style="@style/SetupWizardButton.Positive"
-                    android:id="@+id/next_button"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_done" />
+                    android:layout_marginTop="8dp"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:orientation="horizontal">
+
+                    <Button
+                        style="@style/SetupWizardButton.Negative"
+                        android:id="@+id/add_another_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="@string/fingerprint_enroll_button_add" />
+
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+                    <Button
+                        style="@style/SetupWizardButton.Positive"
+                        android:id="@+id/next_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/security_settings_fingerprint_enroll_done" />
+
+                </LinearLayout>
 
             </LinearLayout>
 
+            <com.android.setupwizardlib.view.FillContentLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/fingerprint_in_app_indicator"
+                    style="@style/SuwContentIllustration"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@android:string/fingerprint_icon_content_description"
+                    android:src="@drawable/fp_app_indicator" />
+
+            </com.android.setupwizardlib.view.FillContentLayout>
+
         </LinearLayout>
-
-        <com.android.setupwizardlib.view.FillContentLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/fingerprint_in_app_indicator"
-                style="@style/SuwContentIllustration"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@android:string/fingerprint_icon_content_description"
-                android:src="@drawable/fp_app_indicator" />
-
-        </com.android.setupwizardlib.view.FillContentLayout>
-
-    </LinearLayout>
-
+    </ScrollView>
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/condition_tile_new_ui.xml b/res/layout/condition_tile_new_ui.xml
index 49bf0c0..710d2f2 100644
--- a/res/layout/condition_tile_new_ui.xml
+++ b/res/layout/condition_tile_new_ui.xml
@@ -19,7 +19,7 @@
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/colorSecondary"
+    android:background="@color/condition_card_background"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index 44455c5..ea518a7 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -24,23 +24,17 @@
     android:layout_height="match_parent"
     app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <include
-            layout="@layout/fingerprint_enroll_find_sensor_graphic"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal|bottom"/>
-
         <LinearLayout
             style="@style/SuwContentFrame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:clipToPadding="false"
             android:clipChildren="false">
@@ -51,21 +45,18 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/suw_description_glif_margin_top"
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <View
-                android:layout_height="0dp"
-                android:layout_width="match_parent"
-                android:layout_weight="1"/>
-
-            <Button
-                style="@style/SuwGlifButton.Secondary"
-                android:id="@+id/next_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_gravity="end"
-                android:text="@string/fingerprint_enroll_button_next" />
-
         </LinearLayout>
-    </FrameLayout>
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <include
+            layout="@layout/fingerprint_enroll_find_sensor_graphic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+    </LinearLayout>
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index ecc122f..939ff92 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -21,7 +21,7 @@
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:icon="@drawable/ic_lock"
+    android:icon="@drawable/ic_suggested_notifications"
     settings:suwFooter="@layout/redaction_interstitial_footer"
     settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
 
@@ -52,6 +52,8 @@
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/lock_screen_notifications_summary_show" />
 
             <com.android.settings.RestrictedRadioButton
@@ -59,6 +61,8 @@
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/lock_screen_notifications_summary_hide" />
 
             <RadioButton
@@ -66,6 +70,8 @@
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/lock_screen_notifications_summary_disable" />
 
         </RadioGroup>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 0a3d952..6d76001 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -24,7 +24,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/material_grey_300">
+        android:background="@color/suggestion_condition_background">
         <android.support.v7.widget.CardView
             android:id="@+id/search_bar"
             android:layout_width="match_parent"
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index 86abe51..d62ae1d 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -25,7 +25,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/material_grey_300">
+        android:background="@color/suggestion_condition_background">
         <android.support.v7.widget.CardView
             android:id="@+id/search_bar"
             android:layout_width="match_parent"
diff --git a/res/layout/suggestion_condition_footer.xml b/res/layout/suggestion_condition_footer.xml
index 4e1bbc8..f9d30e6 100644
--- a/res/layout/suggestion_condition_footer.xml
+++ b/res/layout/suggestion_condition_footer.xml
@@ -19,15 +19,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
-    android:layout_height="56dp"
+    android:layout_height="44dp"
+    android:paddingTop="4dp"
+    android:paddingEnd="16dp"
     android:orientation="horizontal"
-    android:gravity="center|end">
+    android:gravity="end">
 
     <ImageView
         android:id="@+id/collapse_button"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:padding="16dp"
+        android:layout_height="wrap_content"
         android:src="@drawable/ic_expand_less"/>
 
 </LinearLayout>
diff --git a/res/layout/suggestion_condition_header.xml b/res/layout/suggestion_condition_header.xml
index a0f73ae..4519a46 100644
--- a/res/layout/suggestion_condition_header.xml
+++ b/res/layout/suggestion_condition_header.xml
@@ -15,62 +15,80 @@
      limitations under the License.
 -->
 
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
-    android:layout_height="56dp"
-    android:layout_centerHorizontal="true">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <FrameLayout
-        android:id="@android:id/icon_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_centerVertical="true">
+    <Space
+        android:id="@+id/top_space"
+        android:layout_width="match_parent"
+        android:layout_height="9dp"/>
 
-        <include layout="@layout/condition_header_icon" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_centerHorizontal="true">
 
-    </FrameLayout>
+        <FrameLayout
+            android:id="@android:id/icon_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_centerVertical="true">
 
-    <ImageView
-        android:id="@+id/expand_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:padding="16dp"
-        android:src="@drawable/ic_expand_more"/>
+            <include layout="@layout/condition_header_icon" />
 
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_toStartOf="@id/expand_indicator"
-        android:layout_centerVertical="true"
-        android:gravity="end"
-        android:textAppearance="@style/TextAppearance.SuggestionTitle"
-        android:textColor="?android:attr/colorAccent" />
+        </FrameLayout>
 
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@android:id/icon_frame"
-        android:layout_toStartOf="@android:id/summary"
-        android:layout_centerVertical="true"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textAppearance="@style/TextAppearance.SuggestionTitle"
-        android:textColor="?android:attr/colorAccent" />
+        <ImageView
+            android:id="@+id/expand_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:paddingTop="4dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:src="@drawable/ic_expand_more"/>
 
-    <LinearLayout
-        android:id="@+id/additional_icons"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_toStartOf="@android:id/summary"
-        android:layout_toEndOf="@android:id/icon_frame"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"/>
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_toStartOf="@id/expand_indicator"
+            android:layout_centerVertical="true"
+            android:gravity="end"
+            android:textAppearance="@style/TextAppearance.SuggestionTitle"
+            android:textColor="?android:attr/colorAccent" />
 
-</RelativeLayout>
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@android:id/icon_frame"
+            android:layout_toStartOf="@android:id/summary"
+            android:layout_centerVertical="true"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textAppearance="@style/TextAppearance.SuggestionTitle"
+            android:textColor="?android:attr/colorAccent" />
+
+        <LinearLayout
+            android:id="@+id/additional_icons"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toStartOf="@android:id/summary"
+            android:layout_toEndOf="@android:id/icon_frame"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"/>
+
+    </RelativeLayout>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="12dp"/>
+
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0c554e8..578d383 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lig op om wakker te maak"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Stemmingvertoning"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Altyd aan"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuwe kennisgewings"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wanneer om te wys"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuwe kennisgewings"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Maak skerm wakker wanneer jy kennisgewings ontvang"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Altyd aan"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Wys tyd, kennisgewingikone en ander inligting"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Lettertipegrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5be0a36..fa44d5a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ለማንቃት ያንሱ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ከባቢያዊ ማሳያ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ሁልጊዜ ይበራል"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"አዳዲስ ማስታወቂያዎች"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"መቼ እንደሚታይ እንደሚደረግ"</string>
     <string name="doze_title" msgid="2375510714460456687">"አዳዲስ ማስታወቂያዎች"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ማሳወቂያዎችን ሲቀበሉ ማያ ገጽን አንቃ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ሁልጊዜ ይበራል"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"ሰዓት፣ የማሳወቂያ አዶዎች እና ሌላ መረጃ አሳይ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ጽሑፍ ያተልቁ ወይም ያሳንሱ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"የSIM ካርድ ቆልፍ ቅንብሮች"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index a2a7794..2887ff6 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -284,7 +284,7 @@
     <item msgid="3073734345226842233">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
     <item msgid="2111767435887685265">"عرض الإعلام المنبثق"</item>
     <item msgid="1091168669714823370">"وسائط المشروع"</item>
-    <item msgid="485564189219029300">"تنشيط الشبكة الظاهرية الخاصة"</item>
+    <item msgid="485564189219029300">"تنشيط الشبكة الافتراضية الخاصة"</item>
     <item msgid="7155384795265164395">"كتابة الخلفية"</item>
     <item msgid="1835836196806147034">"تركيبة مساعدة"</item>
     <item msgid="5989890403088155055">"لقطة شاشة مساعدة"</item>
@@ -351,7 +351,7 @@
     <item msgid="1312534577834048535">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
     <item msgid="427580389823724225">"عرض الإعلام المنبثق"</item>
     <item msgid="4992007785575926253">"وسائط المشروع"</item>
-    <item msgid="2482631530338029480">"تنشيط الشبكة الظاهرية الخاصة"</item>
+    <item msgid="2482631530338029480">"تنشيط الشبكة الافتراضية الخاصة"</item>
     <item msgid="1662979573471871926">"كتابة الخلفية"</item>
     <item msgid="5964768335278263478">"تركيبة مساعدة"</item>
     <item msgid="2657138701132782702">"لقطة شاشة مساعدة"</item>
@@ -416,12 +416,12 @@
     <item msgid="7169235156349580064">"مخصص"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"‏شبكة ظاهرية خاصة (VPN) عبر PPTP"</item>
-    <item msgid="3799752201662127867">"‏شبكة ظاهرية خاصة (VPN) لـ L2TP/IPSec مزودة بمفاتيح مشتركة مسبقًا"</item>
-    <item msgid="4725504331295252103">"‏شبكة ظاهرية خاصة (VPN) لـ L2TP/IPSec مزودة بشهادات"</item>
-    <item msgid="7526551163264034377">"‏شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بمفاتيح مشتركة مسبقًا ومصادقة Xauth"</item>
-    <item msgid="8064740940687465039">"‏شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة Xauth"</item>
-    <item msgid="4946199982372391490">"‏شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة مختلطة"</item>
+    <item msgid="2732002039459078847">"‏شبكة افتراضية خاصة (VPN) عبر PPTP"</item>
+    <item msgid="3799752201662127867">"‏شبكة افتراضية خاصة (VPN) لـ L2TP/IPSec مزودة بمفاتيح مشتركة مسبقًا"</item>
+    <item msgid="4725504331295252103">"‏شبكة افتراضية خاصة (VPN) لـ L2TP/IPSec مزودة بشهادات"</item>
+    <item msgid="7526551163264034377">"‏شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بمفاتيح مشتركة مسبقًا ومصادقة Xauth"</item>
+    <item msgid="8064740940687465039">"‏شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة Xauth"</item>
+    <item msgid="4946199982372391490">"‏شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة مختلطة"</item>
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"غير متصل"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 360b374..4659af1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1106,13 +1106,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"الرفع لتنبيه الجهاز"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"العرض غير النشط"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"التشغيل دائمًا"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"إشعارات جديدة"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"وقت العرض"</string>
     <string name="doze_title" msgid="2375510714460456687">"إشعارات جديدة"</string>
     <string name="doze_summary" msgid="3846219936142814032">"تنشيط الشاشة عند تلقي إشعارات"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"التشغيل دائمًا"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"إظهار الوقت ورموز الإشعار والمعلومات الأخرى"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"يمكنك تكبير النص أو تصغيره."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏إعدادات تأمين شريحة SIM"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e92e29d..4ed5e15 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik parlaqlıq"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Oyatmaq üçün qaldırın"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ətraf mühit displeyi"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Həmişə aktiv"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yeni bildiriş"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nə vaxt göstərmək lazımdır"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yeni bildiriş"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirişlər aldığınız zaman ekran oyansın"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Həmişə aktiv"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vaxt, bildiriş ikonası və digər məlumatları göstərin"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Şrift ölçüsü"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Mətni kiçildin və ya böyüdün"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SİM kart kilidi parametrləri"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 19d2dc4..4dbe204 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1070,13 +1070,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatski nivo osvetljenosti"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podigni za aktivaciju"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni ekran"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Uvek uključeno"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obaveštenja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada da se prikazuje"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obaveštenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudite ekran kada primite obaveštenja"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Uvek uključeno"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikazuje vreme, ikone obaveštenja i druge informacije"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Omogućava da tekst bude veći ili manji"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Zaključavanje SIM kartice"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9941a1c..9b609a7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1083,13 +1083,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Абуджэнне пры падняцці"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Неактыўны рэжым экрана"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Заўсёды ўключана"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Новыя апавяшчэнні"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Калі паказваць"</string>
     <string name="doze_title" msgid="2375510714460456687">"Новыя апавяшчэнні"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Абуджаць экран, калі вы атрымліваеце апавяшчэнні"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Заўсёды ўключана"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Паказваць значкі часу, памедамленняў і іншыя даныя"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Павялічыць або паменшыць тэкст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налады блакіроўкі SIM-карты"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c8a233f..a327638 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Събуждане при повдигане"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Дисплей, открояващ важни неща"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Винаги включено"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нови известия"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Кога да се показва"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нови известия"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включване на екрана при получаване на известия"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Винаги включено"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Показване на часа, иконите за известия и друга информация"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Уголемяване или намаляване на текст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Заключване на SIM картата"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e3e11f6..dbaca61 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্রিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্রিয় করতে লিফ্ট করুন"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"অ্যাম্বিয়েন্ট ডিসপ্লে"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"সর্বদা চালু"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"নতুন বিজ্ঞপ্তি"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"কখন দেখানো হবে"</string>
     <string name="doze_title" msgid="2375510714460456687">"নতুন বিজ্ঞপ্তি"</string>
     <string name="doze_summary" msgid="3846219936142814032">"যখন আপনি বিজ্ঞপ্তিগুলি পাবেন তখন স্ক্রীন জাগায়"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"সর্বদা চালু"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"সময়, বিজ্ঞপ্তির আইকন ও অন্যান্য তথ্য দেখানো হবে"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"পাঠ্য বড় বা ছোট করুন"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"সিম কার্ড লক সেটিংস"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b924701..f54ac0a 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -132,7 +132,7 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dodirnite za spajanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Primljeni fajlovi"</string>
-    <string name="device_picker" msgid="4978696506172252813">"Izaberi Bluetooth uređaj"</string>
+    <string name="device_picker" msgid="4978696506172252813">"Odaberi Bluetooth uređaj"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"Aplikacija želi uključiti Bluetooth"</string>
@@ -213,7 +213,7 @@
     <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"Poslani podaci:"</string>
     <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"Poruka na čekanju:"</string>
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"Telefonski broj:"</string>
-    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Izaberite radijski obim"</string>
+    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Odaberite radijski obim"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Tip glasovne mreže:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Tip podatkovne mreže:"</string>
     <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Postavite preferiranu vrstu mreže:"</string>
@@ -461,10 +461,10 @@
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite svoj uređaj"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
     <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost podesite rezervni način zaključavanja ekrana."</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izaberite rezervni metod zaključavanja ekrana"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Odaberite rezervni metod zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcije za Zaključani ekran"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje ekrana"</string>
@@ -1073,13 +1073,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podignite za buđenje"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni prikaz"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Uvijek uključeno"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obavještenja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obavještenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekran se aktivira kada primite obavještenja"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Uvijek uključeno"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikaži vrijeme, ikone obavještenja i druge informacije"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Povećavanje ili umanjivanje teksta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
@@ -1108,7 +1110,7 @@
     <string name="sim_enter_ok" msgid="6475946836899218919">"Uredu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Otkaži"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno više SIM-ova"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Izaberite željenu SIM karticu za prijenos mobilnih podataka."</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Odaberite željenu SIM karticu za prijenos mobilnih podataka."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Promijeniti podatkovni SIM?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"Želite li za prijenos mobilnih podataka koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati željenu SIM karticu?"</string>
@@ -1480,7 +1482,7 @@
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Da koristite otisak prsta, postavite lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Da koristite otisak prsta, postavite uzorak"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Da koristite otisak prsta, postavite PIN kôd"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
@@ -1718,7 +1720,7 @@
     <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: trenutno je u upotrebi. Dodirnite Postavke da kontrolirate uslugu."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Glavni proces se koristi."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Usluga <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
-    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Operater <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Pružalac <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zaustaviti sistemsku uslugu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
@@ -2722,7 +2724,7 @@
     <string name="wizard_next" msgid="3606212602795100640">"Naprijed"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Kraj"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Snimi sliku"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"Izaberi sliku iz Galerije"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Odaberi sliku iz Galerije"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"Odaberite fotografiju"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM kartice"</string>
@@ -3041,7 +3043,7 @@
     <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Sve poruke"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Izabrane poruke"</string>
+    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Odabrane poruke"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata označenih zvjezdicom"</string>
@@ -3199,7 +3201,7 @@
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asistent dobija mogućnost čitanja informacija o aplikacijama koje se koriste na vašem sistemu, uključujući informacije vidljive na ekranu ili dostupne unutar aplikacija."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Pristajem"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Ne slažem se"</string>
-    <string name="choose_voice_input_title" msgid="975471367067718019">"Izaberite glasovni unos"</string>
+    <string name="choose_voice_input_title" msgid="975471367067718019">"Odaberite glasovni unos"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Aplikacija preglednika"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nema zadanog pretraživača"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Aplikacija za pozive"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 4efc4cf..984552b 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -146,7 +146,7 @@
     <item msgid="8986346415847956850">"Excel·lent"</item>
   </string-array>
   <string-array name="data_usage_data_range">
-    <item msgid="5013973108901348144">"Els darrers 30 dies"</item>
+    <item msgid="5013973108901348144">"30 darrers dies"</item>
     <item msgid="6600989128423965319">"Defineix el cicle d\'ús..."</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
@@ -250,7 +250,7 @@
     <item msgid="8281201165558093009">"exploració de Wi-Fi"</item>
     <item msgid="8694611243479480497">"notificació"</item>
     <item msgid="7776439107987345446">"exploració de cel·la"</item>
-    <item msgid="514615766544675057">"trucada de telèfon"</item>
+    <item msgid="514615766544675057">"trucada"</item>
     <item msgid="8181415497109310680">"llegeix SMS"</item>
     <item msgid="6816551144382117307">"escriu SMS"</item>
     <item msgid="4600463921908905030">"rep SMS"</item>
@@ -317,7 +317,7 @@
     <item msgid="1638204101698708656">"Ubicació"</item>
     <item msgid="2154671955760380322">"Notificació de la publicació"</item>
     <item msgid="4282477730595931828">"Ubicació"</item>
-    <item msgid="4891423912898525905">"Trucada de telèfon"</item>
+    <item msgid="4891423912898525905">"Trucada"</item>
     <item msgid="2623604824935968113">"Llegeix l\'SMS/MMS"</item>
     <item msgid="4420177125221176306">"Escriu un SMS/MMS"</item>
     <item msgid="3986142739951490025">"Rep SMS/MMS"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a1ecd01..e65a69d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca el dispositiu per activar-lo"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambient"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre activat"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificacions noves"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quan es mostra"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notificacions noves"</string>
     <string name="doze_summary" msgid="3846219936142814032">"La pantalla s\'activa quan arriben notificacions"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activat"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra l\'hora, les icones de notificació i altres dades"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Config. de bloqueig de SIM"</string>
@@ -1999,14 +2001,14 @@
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
     <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"Atura l\'aplicació"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"Vols desactivar l\'ús en segon pla i aturar l\'aplicació?"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactiva"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Vols desactivar la ubicació?"</string>
     <string name="dialog_location_message" product="default" msgid="7774807745601479888">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index df2eee1..2352943 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Probudit zvednutím zařízení"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambientní displej"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vždy zapnuto"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nová oznámení"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kdy zobrazit"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nová oznámení"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudit obrazovku, když dostanete oznámení"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Vždy zapnuto"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Zobrazovat čas, ikony oznámení a další informace"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Umožňuje zvětšit nebo zmenšit text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6d22e2f..9765f35 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv skærm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Altid aktiveret"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal det vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye underretninger"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Væk skærmen, når du modtager underretninger"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Altid aktiveret"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vis klokkeslæt, underretningsikoner og andre oplysninger"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for låst SIM-kort"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a873a08..8ab4329 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Zum Aktivieren anheben"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktivitätsdisplay"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Immer aktiviert"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Neue Benachrichtigungen"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Anzeige"</string>
     <string name="doze_title" msgid="2375510714460456687">"Neue Benachrichtigungen"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bei Benachrichtigungen Bildschirm aktivieren"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Immer aktiviert"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Uhrzeit, Benachrichtigungssymbole und andere Informationen anzeigen"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Text vergrößern oder verkleinern"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Sperre"</string>
@@ -1996,22 +1998,22 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Häufige Standortabfrage"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> fehlerhafte Apps"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"App beenden?"</string>
-    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Der Akkuverbrauch deines Smartphones kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Der Akkuverbrauch deines Tablets kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Der Akkuverbrauch deines Geräts kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Der Akkuverbrauch deines Smartphones kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Der Akkuverbrauch deines Tablets kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Der Akkuverbrauch deines Geräts kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Smartphones zu erhöhen."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Tablets zu erhöhen."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Eine normale Verwaltung des Akkuverbrauchs deines Geräts ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Geräts zu erhöhen."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Smartphones zu erhöhen."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Tablets zu erhöhen."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Eine normale Verwaltung des Akkuverbrauchs deines Geräts ist nicht möglich, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Gerät zu erhöhen."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"App beenden"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"Hintergrundnutzung deaktivieren und App beenden?"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Der Akkuverbrauch deines Smartphones kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv ist."</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Der Akkuverbrauch deines Tablets kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv ist."</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Der Akkuverbrauch deines Geräts kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv ist."</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Eine normale Verwaltung des Akkuverbrauchs ist nicht möglich, da das Smartphone durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv bleibt."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Eine normale Verwaltung des Akkuverbrauchs ist nicht möglich, da das Tablet durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv bleibt."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Eine normale Verwaltung des Akkuverbrauchs ist nicht möglich, da das Gerät durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv bleibt."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Deaktivieren"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Standortzugriff deaktivieren?"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Der Akkuverbrauch deines Smartphones kann nicht normal verwaltet werden, weil <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Der Akkuverbrauch deines Tablets kann nicht normal verwaltet werden, weil <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Der Akkuverbrauch deines Geräts kann nicht normal verwaltet werden, weil <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, da <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, da <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Eine normale Verwaltung des Akkuverbrauchs deines Geräts ist nicht möglich, da <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"Deaktivieren"</string>
     <string name="power_screen" msgid="3023346080675904613">"Display"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taschenlampe"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 23e17ac..7c8b4a2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Σηκώστε για ενεργοποίηση"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Οθόνη περιβάλλοντος"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Πάντα ενεργή"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Νέες ειδοποιήσεις"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Χρόνος εμφάνισης"</string>
     <string name="doze_title" msgid="2375510714460456687">"Νέες ειδοποιήσεις"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Αφύπνιση οθόνης κατά τη λήψη ειδοποιήσεων"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Πάντα ενεργό"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Εμφάνιση ώρας, εικονιδίων ειδοποίησης και άλλων πληροφοριών"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Κάντε το κείμενο μεγαλύτερο ή μικρότερο"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδ/τος SIM"</string>
@@ -1997,10 +1999,10 @@
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές που δεν λειτουργούν σωστά"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Διακοπή εφαρμογής;"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Το tablet δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
     <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το τηλέφωνο διαρκώς.\n\nΓια να δοκιμάσετε να επιδιορθώσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Το tablet δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το tablet διαρκώς.\n\nΓια να δοκιμάσετε να επιδιορθώσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το tablet διαρκώς.\n\nΓια να δοκιμάσετε να επιδιορθώσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει τη συσκευή διαρκώς.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"Διακοπή εφαρμογής"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"Απενεργοπ. χρήσης στο παρασκήνιο και διακοπή της εφαρμογής;"</string>
@@ -2009,9 +2011,9 @@
     <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει τη συσκευή σας διαρκώς.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g> και να αποτρέψετε την εκτέλεσή της στο παρασκήνιο."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Απενεργοποίηση"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Απενεργοποίηση τοποθεσίας;"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν χρησιμοποιείτε την εφαρμογή.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Το tablet δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν χρησιμοποιείτε την εφαρμογή.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν χρησιμοποιείτε την εφαρμογή.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν την χρησιμοποιείτε.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν την χρησιμοποιείτε.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν την χρησιμοποιείτε. \n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"Απενεργοποίηση"</string>
     <string name="power_screen" msgid="3023346080675904613">"Οθόνη"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Φακός"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a0e2e00..91c3c7f 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Always on"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a0e2e00..91c3c7f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Always on"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a0e2e00..91c3c7f 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Always on"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c97747b..1927aed 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Siempre activada"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla al recibir notificaciones"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar hora, íconos de notificaciones y otra información"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o reduce el tamaño del texto en pantalla"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueo de la tarjeta SIM"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bf38ab6..b431d59 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Siempre activada"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo debe mostrarse"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar pantalla al recibir notificaciones"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar la hora, iconos de notificación y otra información"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de la fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o disminuye el tamaño del texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 241f8f0..2eb1b8e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tõstke äratamiseks"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Säästlik ekraan"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alati sees"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Uued märguanded"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Millal kuvada?"</string>
     <string name="doze_title" msgid="2375510714460456687">"Uued märguanded"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekraan aktiveerub, kui saate märguandeid"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Alati sees"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Näitamise aeg, märguande ikoonid ja muu teave"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Teksti suuremaks või väiksemaks muutmine"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaardi luku seaded"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index acf8ac0..6e6cb48 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Distira automatikoa"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktibatu eskuetan hartzen denean"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantaila iluna"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Beti aktibatuta"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jakinarazpen berriak"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Noiz erabili"</string>
     <string name="doze_title" msgid="2375510714460456687">"Jakinarazpen berriak"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Beti aktibatuta"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -1997,35 +1999,22 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Gailua sarriegi ari da eskatzen kokapena"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Aplikazioa gelditu nahi duzu?"</string>
-    <!-- no translation found for dialog_stop_message (4006631636646776488) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (2369957934555162428) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (6195430620406365292) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message_wakeup_alarm (1638726742782558262) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message_wakeup_alarm (8771690983566539742) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message_wakeup_alarm (2854944538238649520) -->
-    <skip />
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g>\n\n\n\n"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tabletak ezin du kudeatu bateria modu normalean <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi aplikazioa.\nArazoa horrela ere konpontzen ez bada\n, agian aplikazioa desinstalatu beharko duzu bateriak gehiago iraun dezan."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Gailuak ezin du kudeatu bateria modu normalean <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi aplikazioa.\nHorrela\n ere arazoa konpontzen ez bada, agian aplikazioa desinstalatu beharko duzu bateriak gehiago iraun dezan."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>\n\n <xliff:g id="APP_1">%1$s</xliff:g>.\n\n"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>\n\n <xliff:g id="APP_1">%1$s</xliff:g>.\n\n"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>\n\n <xliff:g id="APP_1">%1$s</xliff:g>.\n\n"</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"Gelditu aplikazioa"</string>
-    <!-- no translation found for dialog_background_check_title (6936542136153283692) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (4045827746349279563) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (8348214419901788270) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (5847977433118915863) -->
-    <skip />
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Atzeko planoko erabilera desaktibatu eta aplikazioa gelditu?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefonoak ezin du kudeatu bateria modu normalean <xliff:g id="APP_0">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi <xliff:g id="APP_1">%1$s</xliff:g> aplikazioa atzeko planoan exekuta ez dadin."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tabletak ezin du kudeatu bateria modu normalean <xliff:g id="APP_0">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi <xliff:g id="APP_1">%1$s</xliff:g> aplikazioa atzeko planoan exekuta ez dadin."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Gailuak ezin du kudeatu bateria modu normalean <xliff:g id="APP_0">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi <xliff:g id="APP_1">%1$s</xliff:g> aplikazioa atzeko planoan exekuta ez dadin."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Desaktibatu"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Kokapena desaktibatu nahi duzu?"</string>
-    <!-- no translation found for dialog_location_message (7774807745601479888) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (118745801732181618) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (6783678153382298295) -->
-    <skip />
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Telefonoak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, baita aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazoa konpontzeko, desaktibatu aplikazio horrek kokapena erabiltzeko aukera."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tabletak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, baita aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazoa konpontzeko, desaktibatu aplikazio horrek kokapena erabiltzeko aukera."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Gailuak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, baita aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazoa konpontzeko, desaktibatu aplikazio horrek kokapena erabiltzeko aukera."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"Desaktibatu"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantaila"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
@@ -2798,8 +2787,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"lerratu desblokeatzeko, pasahitza, eredua, PIN, kodea"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"laneko erronka, lana, profila"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"laneko profila, kudeatutako profila, bateratu, bateratzea, lana, profila"</string>
-    <!-- no translation found for keywords_gesture (3526905012224714078) -->
-    <skip />
+    <string name="keywords_gesture" msgid="3526905012224714078">"keinuak"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ordaindu, ukitu, ordainketak"</string>
     <string name="keywords_backup" msgid="470070289135403022">"babeskopia, segurtasun kopia"</string>
     <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"keinua, ertza, alboa, ertz aktiboa, estutu, estutzea, heldu, eutsi, oratu, laguntza, lagundu, laguntzailea, ok google, google laguntzailea"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ac51a0a..9087068 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"بیدار شدن با بالا بردن"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"نمایشگر محیط"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"همیشه روشن"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"اعلان‌های جدید"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"زمان نمایش دادن"</string>
     <string name="doze_title" msgid="2375510714460456687">"اعلان‌های جدید"</string>
     <string name="doze_summary" msgid="3846219936142814032">"روشن شدن صفحه‌نمایش هنگامی که اعلانی دریافت می‌کنید"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"همیشه روشن"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"نمایش زمان، نمادهای اعلان و سایر اطلاعات"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"نوشتار را بزرگ‌تر یا کوچک‌تر کنید"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 849242d..555f062 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Herätä nostamalla"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Himmennetty näyttö"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Aina käytössä"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Uudet ilmoitukset"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Näyttämisaika"</string>
     <string name="doze_title" msgid="2375510714460456687">"Uudet ilmoitukset"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivoi näyttö, kun saat ilmoituksia."</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Aina käytössä"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Näytä aika, ilmoitukset, kuvakkeet ja muut tiedot."</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ad8e0c4..9876be9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Toujours activé"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quand afficher"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lorsque vous recevez des notifications"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afficher l\'heure, les icônes de notifications et d\'autres renseignements"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandissez ou réduisez le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage SIM"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9eeede8..03c154b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Toujours activé"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Activation du mode Veille"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lors de la réception de notifications"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afficher l\'heure, les icônes de notification et d\'autres informations"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandir ou réduire le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres verrouillage SIM"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6798e71..2897984 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para acender"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre activado"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificacións"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cando mostrar a pantalla"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificacións"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activa a pantalla cando recibes notificacións"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activado"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra a hora, as iconas de notificación e outra información"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Reduce ou amplía o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da SIM"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 918a4c9..d7e4db6 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"સ્વચલિત તેજ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"જાગૃત કરવા માટે લિફ્ટ કરો"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ઍમ્બિઅન્ટ પ્રદર્શન"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"હંમેશાં ચાલુ"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"નવી સૂચનાઓ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ક્યારે બતાવવું"</string>
     <string name="doze_title" msgid="2375510714460456687">"નવી સૂચનાઓ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"જ્યારે તમને સૂચનાઓ પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"હંમેશાં ચાલુ"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"સમય, સૂચનાના આઇકન અને અન્ય માહિતી બતાવો"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ફોન્ટનું કદ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM કાર્ડ લૉક સેટિંગ્સ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 765aca0..6f614ab 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप स्क्रीन की रोशनी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करने के लिए उठाएं"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"व्यापक प्रदर्शन"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"हमेशा चालू"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नए नोटिफ़िकेशन"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कब दिखाना है"</string>
     <string name="doze_title" msgid="2375510714460456687">"नए नोटिफ़िकेशन"</string>
     <string name="doze_summary" msgid="3846219936142814032">"आपको नोटिफ़िकेशन मिलने पर स्‍क्रीन सक्रिय करें"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"हमेशा चालू"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"शो का समय, नोटिफ़िकेशन आइकन और दूसरी जानकारी"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"लेख को छोटा या बड़ा करें"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string>
@@ -2009,9 +2011,9 @@
     <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"बंद करें"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"स्थान बंद करना चाहते हैं?"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान बंद कर सकते हैं."</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान बंद कर सकते हैं."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान सेवा बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान सेवा बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान सेवा बंद कर सकते हैं."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"बंद करें"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ़्लैशलाइट"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 61e41d4..b277508 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1070,13 +1070,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktivacija podizanjem"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni zaslon"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Uvijek uključeno"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nove obavijesti"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nove obavijesti"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktiviraj zaslon kada stigne obavijest"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Uvijek uključeno"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikazivanje vremena, ikona obavijesti i drugih informacija"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Smanjite ili povećajte tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaklj. SIM kartice"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d577b53..d8fc693 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Felébresztéshez emelje meg"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Környezeti kijelző"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Mindig bekapcsolva"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Új értesítések"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Mikor jelenjen meg"</string>
     <string name="doze_title" msgid="2375510714460456687">"Új értesítések"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Képernyő felébresztése értesítés érkezésekor"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Mindig bekapcsolva"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Az idő, az értesítési ikonok és egyéb információk megjelenítése"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Szöveg nagyítása és kicsinyítése"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index ae3c28b..a09f5d5 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -264,7 +264,7 @@
     <item msgid="1545733463471924009">"պատկերել վերին մասում"</item>
     <item msgid="3609046903962454582">"մուտք գործել ծանուցումներ"</item>
     <item msgid="4671646036128214513">"ֆոտոխցիկ"</item>
-    <item msgid="1097324338692486211">"ձայնագրել ձայնանյութ"</item>
+    <item msgid="1097324338692486211">"ձայնագրել աուդիո ֆայլ"</item>
     <item msgid="5031552983987798163">"նվագարկել ձայնանյութը"</item>
     <item msgid="8374996688066472414">"կարդալ սեղմատախտակը"</item>
     <item msgid="3045529469061083747">"փոփոխել սեղմատախտակը"</item>
@@ -331,7 +331,7 @@
     <item msgid="736541391767350377">"Պատկերել վերևի մասում"</item>
     <item msgid="5530815681721654194">"Մուտք գործել ծանուցումներ"</item>
     <item msgid="781213371706962767">"Տեսախցիկ"</item>
-    <item msgid="1720492593061838172">"Ձայնագրել ձայնանյութ"</item>
+    <item msgid="1720492593061838172">"Ձայնագրել աուդիո ֆայլ"</item>
     <item msgid="3493046322001257041">"Նվագարկել ձայնանյութը"</item>
     <item msgid="136815868796597058">"Կարդալ սեղմատախտակը"</item>
     <item msgid="5238692940326972503">"Փոփոխել սեղմատախտակը"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7fbc81a..631f011 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ավտոմատ պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Անգործուն ռեժիմի էկրան"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Միշտ միացված է"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Նոր ծանուցումներ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Երբ ցուցադրել"</string>
     <string name="doze_title" msgid="2375510714460456687">"Նոր ծանուցումներ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնել էկրանը ծանուցումներ ստանալու դեպքում"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Միշտ միացված է"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Ցուցադրել ժամանակը, ծանուցումների պատկերակները և այլ տեղեկություններ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Տառաչափի մեծացում կամ փոքրացում"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bdf007e..fc0bc70 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk membangunkan"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Tampilan ambien"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Selalu aktif"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notifikasi baru"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu ditampilkan"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notifikasi baru"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Membangunkan layar saat Anda menerima notifikasi"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Selalu aktif"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tampilkan waktu, ikon notifikasi, dan info lainnya"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Membuat teks menjadi lebih besar atau lebih kecil"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
@@ -2009,8 +2011,8 @@
     <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan perangkat.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>, lalu mencegahnya agar tidak berjalan di background."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Nonaktifkan"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Nonaktifkan lokasi?"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini"</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
     <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"Nonaktifkan"</string>
     <string name="power_screen" msgid="3023346080675904613">"Layar"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 9c0f56f..e28ec7c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Sjálfvirk birtustilling"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lyfta til að vekja"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Umhverfisskjár"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alltaf kveikt"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nýjar tilkynningar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Sýnt hvenær"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nýjar tilkynningar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vekja skjáinn þegar þú færð tilkynningar"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Alltaf kveikt"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Sýna tíma, tilkynningartákn og aðrar upplýsingar"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
@@ -1997,12 +1999,12 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Biður oft um staðsetningu"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> forrit vinna ekki rétt"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Stöðva forritið?"</string>
-    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur símanum vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta frammistöðu rafhlöðunnar."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur spjaldtölvunni vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta frammistöðu rafhlöðunnar."</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Tækið getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur tækinu vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta frammistöðu rafhlöðunnar."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur símann í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta frammistöðu rafhlöðunnar."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur spjaldtölvuna í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta frammistöðu rafhlöðunnar."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Tækið getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur tækið í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta frammistöðu rafhlöðunnar."</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur símanum vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur spjaldtölvunni vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Tækið getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur tækinu vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur símann í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur spjaldtölvuna í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Tækið getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur tækið í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"Stöðva forrit"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"Slökkva á notkun í bakgrunni og slökkva á forritinu?"</string>
     <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Rafhlöðunotkun símans er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP_0">%1$s</xliff:g> vekur símann í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú stöðvað <xliff:g id="APP_1">%1$s</xliff:g> og komið í veg fyrir að það keyri í bakgrunni."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 29bdd5e..e926de7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Solleva per riattivare"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Display Ambient"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre attivo"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuove notifiche"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrare"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuove notifiche"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Lo schermo viene riattivato quando ricevi notifiche"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre attivo"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra ora, icone di notifica e altre informazioni"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Ingrandisci o riduci il testo"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b332c43..f214759 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"הרם כדי להוציא ממצב שינה"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"תצוגה סביבתית"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"פועל תמיד"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"הודעות חדשות"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"מתי להציג"</string>
     <string name="doze_title" msgid="2375510714460456687">"הודעות חדשות"</string>
     <string name="doze_summary" msgid="3846219936142814032">"המסך יתעורר כשמתקבלות הודעות"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"פועל תמיד"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"הצגה של השעה, של סמלי ההודעות ושל פרטים אחרים"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"הגדלה או הקטנה של גודל הטקסט"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏הגדרות נעילת כרטיס SIM"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3cec5a0..6a26f8e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"指を離してスリープ状態から復帰"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"常に画面表示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"常に ON"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新しい通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"表示するタイミング"</string>
     <string name="doze_title" msgid="2375510714460456687">"新しい通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"通知を受信したときにスリープ状態から復帰"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"常に ON"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"時刻、通知アイコンなどの情報を表示します"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"テキストのサイズを変更します"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
@@ -1996,17 +1998,17 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"位置情報を頻繁にリクエストしています"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリの動作に問題があります"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"アプリを停止しますか？"</string>
-    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> によってスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> によってスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> によってスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> によってスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> によってスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> によってスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"アプリを停止する"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"バックグラウンドでの使用を OFF にしてアプリを停止しますか？"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> によってスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> によってスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> によってスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"OFF にする"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"位置情報を OFF にしますか？"</string>
     <string name="dialog_location_message" product="default" msgid="7774807745601479888">"使用中でないときに <xliff:g id="APP">%1$s</xliff:g> が位置情報のリクエストを繰り返しているため、スマートフォンで電池を正常に管理できません。\n\nこの問題を解決するには、このアプリでの位置情報の利用を OFF にします。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 986bf6b..8d4ed0d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური სიკაშკაშე"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"გაღვიძება აწევისას"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ემბიენტური ეკრანი"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ყოველთვის ჩართული"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ახალი შეტყობინებები"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ჩვენების წესები"</string>
     <string name="doze_title" msgid="2375510714460456687">"ახალი შეტყობინებები"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ეკრანის გამოღვიძება შეტყობინებების მიღებისას"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ყოველთვის ჩართული"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"დროის, შეტყობინებათა ხატულების და სხვა ინფორმაციის ჩვენება"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"შრიფტის ზომა"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ტექსტის გადიდება ან დაპატარავება"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ბარათის დაბლოკვის პარამეტრები"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 33730c0..2925f7c 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Айналаны көрсету"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Әрқашан қосулы"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңа хабарландырулар"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Көрсетілетін уақыты"</string>
     <string name="doze_title" msgid="2375510714460456687">"Жаңа хабарландырулар"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Хабарландырулар келгенде, экранды ұйқы режимінен шығару"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Әрқашан қосулы"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Уақытын, хабарландыру белгішелерін және басқа ақпаратты көрсету"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Шрифт өлшемі"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Мәтінді үлкейтеді немесе кішірейтеді"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картасын бекіту параметрлері"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index ca8b974..dab20f6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"លើក​ដៃ​ដើម្បី​ឲ្យ​ភ្ញាក់"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"មុខងារអេក្រង់សម្ងំ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"បើក​ជា​និច្ច"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ពេលដែលត្រូវ​បង្ហាញ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ដាស់អេក្រង់នៅពេលដែលអ្នកទទួលបានការជូនដំណឹង"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"បើក​ជា​និច្ច"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"បង្ហាញ​ម៉ោង រូបតំណាងការជូនដំណឹង និងព័ត៌មានផ្សេងទៀត"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ទំហំពុម្ពអក្សរ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ធ្វើឲ្យអក្សរធំជាងមុន ឬតូចជាងមុន"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ff07163..b33f1f0 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ಸ್ವಯಂಚಾಲಿತ ಪ್ರಖರತೆ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ಎಬ್ಬಿಸಲು ಎತ್ತಿರಿ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ಯಾವಾಗಲೂ ಆನ್"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ಯಾವಾಗ ತೋರಿಸಬೇಕು"</string>
     <string name="doze_title" msgid="2375510714460456687">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನೀವು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸಿ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ಯಾವಾಗಲೂ ಆನ್"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a52a028..e7bc46f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"기기를 들어 대기 모드 해제"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"절전 모드 자동 해제"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"항상 사용"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"새로운 알림"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"표시 시점"</string>
     <string name="doze_title" msgid="2375510714460456687">"새로운 알림"</string>
     <string name="doze_summary" msgid="3846219936142814032">"알림을 수신하면 절전 모드를 해제합니다."</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"항상 사용"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"시간, 알림 아이콘 등의 정보 표시"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"텍스트를 확대 또는 축소"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
@@ -2001,12 +2003,12 @@
     <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"앱 종료"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"백그라운드 사용을 중지하고 앱을 종료하시겠습니까?"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 할 수 있습니다."</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 할 수 있습니다."</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 할 수 있습니다."</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 하세요."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 하세요."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 하세요."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"사용 중지"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"위치를 사용 중지하시겠습니까?"</string>
     <string name="dialog_location_message" product="default" msgid="7774807745601479888">"앱을 사용하지 않을 때도 <xliff:g id="APP">%1$s</xliff:g>에서 계속 위치를 요청하여 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 이 앱에서 위치 사용을 중지하세요."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a895488..47ec1cf 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматтык жарыктык"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ойготуу үчүн көтөрүү"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Көшүү режиминин дисплейи"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Ар дайым күйүк"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңы эскертмелер"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Көрсөтүү убагы"</string>
     <string name="doze_title" msgid="2375510714460456687">"Жаңы эскертмелер"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Эскертмелерди алганыңызда экран күйөт"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Ар дайым күйүк"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрсөтүү"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Арип өлчөмү"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Текстти чоңойтуп же кичирейтиңиз"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картаны кулпулоо жөндөөлөрү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index b43a751..7d54a03 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ຍົກ​ເພື່ອ​ເປີດ​ໜ້າ​ຈໍ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ການສະແດງຜົນສະພາບແວດລ້ອມ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ເປີດຕະຫຼອດ"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ສະແດງຕອນໃດ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ເປີດໜ້າຈໍເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ເປີດຕະຫຼອດ"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"ສະແດງເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ຂະໜາດຕົວອັກສອນ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ເຮັດໃຫ້ຂໍ້ຄວາມໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ການຕັ້ງຄ່າການລັອກ SIM card"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f38a71d..54dd779 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Adaptyvusis vaizdas"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Visada įjungta"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nauji pranešimai"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada rodyti"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nauji pranešimai"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Pažadinti ekraną, kai gaunamas pranešimas"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Visada įjungta"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Rodymo laikas, pranešimų piktogramos ir kita informacija"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Padidinkite arba sumažinkite tekstą"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 73cefef..c719983 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1070,13 +1070,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pacelt, lai ieslēgtu"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Gaidstāves ekrāns"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vienmēr ieslēgts"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jauni paziņojumi"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kad rādīt"</string>
     <string name="doze_title" msgid="2375510714460456687">"Jauni paziņojumi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivizēt ekrānu, kad tiek saņemts paziņojums"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Vienmēr ieslēgts"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tiek rādīts laiks, paziņojumu ikonas un cita informācija."</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palielināt vai samazināt tekstu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
diff --git a/res/values-mcc262-mnc02-ca/strings.xml b/res/values-mcc262-mnc02-ca/strings.xml
index 48107c1..3d42f4f 100644
--- a/res/values-mcc262-mnc02-ca/strings.xml
+++ b/res/values-mcc262-mnc02-ca/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No pots fer trucades d\'emergència per Wi-Fi. Si proves de fer-ho, el dispositiu utilitzarà automàticament la xarxa de telefonia mòbil. Les trucades d\'emergència només es poden fer en zones amb cobertura de telefonia mòbil."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No pots fer trucades d\'emergència per Wi-Fi. Si proves de fer-ho, el dispositiu utilitzarà automàticament la xarxa mòbil. Les trucades d\'emergència només es poden fer en zones amb cobertura de telefonia mòbil."</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-hu/strings.xml b/res/values-mcc262-mnc02-hu/strings.xml
index f299826..845cc6c 100644
--- a/res/values-mcc262-mnc02-hu/strings.xml
+++ b/res/values-mcc262-mnc02-hu/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi-hívással nem tud vészhívást kezdeményezni. Vészhívás kezdeményezéséhez eszköze automatikusan mobilhálózatra vált. Vészhívást csak hálózatilag lefedett helyekről indíthat."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi-hívással nem tud segélyhívást kezdeményezni. Segélyhívás kezdeményezéséhez eszköze automatikusan mobilhálózatra vált. Segélyhívást csak hálózatilag lefedett helyekről indíthat."</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 5323c54..44c6130 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматска осветленост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигнете да се активира"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Амбиентален екран"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Секогаш вклучен"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нови известувања"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Кога да се прикажува"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нови известувања"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Разбудете го екранот кога ќе примите известувања"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Секогаш вклученa"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Прикажување на времето, икони за известување и други информации"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Намалете го или зголемете го текстот"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Поставки на заклучување на SIM картичка"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a45ece2..e27e6b7 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"യാന്ത്രിക തെളിച്ചം"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"സജീവമാക്കാൻ ലിഫ്റ്റുചെയ്യുക"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"അറിയിപ്പിനു സ്ക്രീൻ ഓണാക്കുക"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"കാണിക്കേണ്ട സമയം"</string>
     <string name="doze_title" msgid="2375510714460456687">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുന്ന സമയത്ത് സ്ക്രീൻ സജീവമാക്കുക"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ എന്നിവയും മറ്റ് വിവരങ്ങളും കാണിക്കുക"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 47208e6..39d7583 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автомат гэрэлтүүлэг"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Сэрээхийн тулд өргөх"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Идэвхгүй дэлгэц"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Байнга асаалттай"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Шинэ мэдэгдэл"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Хэзээ харуулах вэ"</string>
     <string name="doze_title" msgid="2375510714460456687">"Шинэ мэдэгдэл"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Дэлгэцийг мэдэгдэл авсан үедээ сэрээх"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Байнга асаалттай"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Цаг, мэдэгдлийн дүрс тэмдэг, бусад мэдээллийг харуулах"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Фонтын хэмжээ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Текстийг том эсвэл жижиг болгох"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картын түгжээний тохиргоо"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0bad429..cb33aa0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वयंचलित चकाकी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करण्‍यासाठी लिफ्‍ट"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"अँबियन्ट डिसप्ले"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"नेहमी चालू"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नवीन सूचना"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कधी दाखवायचे"</string>
     <string name="doze_title" msgid="2375510714460456687">"नवीन सूचना"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचना प्राप्त केल्यावर स्क्रीन सक्रिय करा"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"नेहमी चालू"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"वेळ, सूचना चिन्‍हे आणि इतर माहिती दाखवा"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"मजकूर आणखी मोठा किंवा आणखी लहान करा"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग्ज"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index d7a6382..4c4666d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk bangunkan"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Paparan ambien"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sentiasa hidup"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Pemberitahuan baharu"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu untuk tunjukkan"</string>
     <string name="doze_title" msgid="2375510714460456687">"Pemberitahuan baharu"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktifkan skrin apabila anda menerima pemberitahuan"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sentiasa hidup"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tunjukkan masa, ikon pemberitahuan dan maklumat lain"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Besarkan atau kecilkan teks"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c2fe801..614c9ee 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"နှိုးပေးဖို့ မ’ယူရန်"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ဝန်းကျင်ပြသမှု"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"အကြောင်းကြားချက်အသစ်များ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ပြသရမည့်အချိန်"</string>
     <string name="doze_title" msgid="2375510714460456687">"အကြောင်းကြားချက်အသစ်များ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"အကြောင်းကြားချက်များ သင်လက်ခံရရှိချိန်တွင် ဖန်သားပြင်ကို ဖွင့်ခိုင်းပါ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို ပြသပါ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"စာလုံးအရွယ်အစား"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"စာလုံးကို ပိုကြီးအောင် သို့မဟုတ် ပိုသေးအောင်ပြုလုပ်ပါ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5b9bd94..e401dc3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Passiv skjerm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alltid på"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye varsler"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Når det skal vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye varsler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Skjermen slås på når du mottar varsler"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vis klokkeslett, varselikoner og annen informasjon"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 24bf20c..e7970d8 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित उज्यालोपना"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"चालु गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"एम्बियन्ट प्रदर्शन"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"सधैँ सक्रिय"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नयाँ सूचनाहरू"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"देखाउने समय"</string>
     <string name="doze_title" msgid="2375510714460456687">"नयाँ सूचनाहरू"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचनाहरू प्राप्त हुँदा स्क्रिनलाई सक्रिय गर्नुहोस्"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"सधैँ सक्रिय"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"समय, सूचनाका आइकनहरू र अन्य जानकारीहरू देखाउनुहोस्"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"फन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"पाठ सन्देश अझ ठूलो वा सानो पार्नुहोस्"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM कार्ड लक सेटिङहरू"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f1de286..cce8423 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Optillen om te activeren"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Actieve display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Altijd aan"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nieuwe meldingen"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wanneer weergeven"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nieuwe meldingen"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Scherm activeren wanneer je meldingen ontvangt"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Altijd aan"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tijd, meldingspictogrammen en andere informatie weergeven"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tekst groter of kleiner maken"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen simkaartvergrendeling"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7ad9e8a..ff30de8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ਸਵੈਚਲਿਤ ਚਮਕ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ਸਕਿਰਿਆ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ਦਿਖਾਉਣ ਦਾ ਸਮਾਂ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਸਜੀਵ ਕਰੋ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ਕਾਰਡ ਲੌਕ ਸੈਟਿੰਗਾਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8a77f50..eb215b5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podnieś, by wybudzić"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekran dostosowany do otoczenia"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Zawsze włączony"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nowe powiadomienia"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kiedy wyświetlać"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nowe powiadomienia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Włącz ekran po otrzymaniu powiadomień"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Zawsze włączony"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Pokazuj godzinę, ikony powiadomień i inne informacje"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Powiększ lub pomniejsz tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8f21123..88cf9dd 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre ativada"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar horário, ícones de notificação e outras informações"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b9e9eac..7f57c56 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ativar ao levantar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Visualização ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre ativado"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando apresentar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar o ecrã quando recebe notificações"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar as horas, os ícones das notificações e outras informações"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumentar ou diminuir o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8f21123..88cf9dd 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre ativada"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar horário, ícones de notificação e outras informações"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ca14bd2..329419a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1070,13 +1070,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ridicați pentru a reactiva"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Afișaj ambiental"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Activat permanent"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificări noi"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Când să se afișeze"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notificări noi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activează ecranul când primiți notificări"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Activat permanent"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afișați ora, pictogramele pentru notificări și alte informații"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiunea fontului"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Măriți sau micșorați textul"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1bbbd2f..95faa83 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Активация в вертикальном положении"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Автоматич. включение экрана"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Всегда включен"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"При новых уведомлениях"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Когда включать экран"</string>
     <string name="doze_title" msgid="2375510714460456687">"При новых уведомлениях"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включать экран, когда приходит уведомление"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Всегда включено"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Показывать время, значки уведомлений и другую информацию"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Увеличение или уменьшение размера шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9367063..bcd4ab2 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ස්වයංක්‍රිය දීප්තිය"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"අවදි කිරීමට ඔසවන්න"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ස්ථානික සංදර්ශකය"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"සැම විට ක්‍රියාත්මකයි"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"නව දැනුම්දීම්"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"පෙන්වන අවස්ථාව"</string>
     <string name="doze_title" msgid="2375510714460456687">"නව දැනුම්දීම්"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ඔබට දැනුම්දීම් ලැබුණ විට තිරය අවදි කරන්න"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"සැමවිට ක්‍රියාත්මක"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"වේලාව, දැනුම්දීම් තොරතුරු, සහ වෙනත් තොරතුරු පෙන්වන්න"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"අකුරු ප්‍රමාණය"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"පෙළ වඩාත් විශාල හෝ කුඩා කරන්න"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM කාඩ් පතෙහි අඟුළු සැකසුම්"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 54947f1..b72ebce 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Prebudiť zdvihnutím"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambientné zobrazenie"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vždy zapnuté"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nové upozornenia"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kedy zobrazovať"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nové upozornenia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Prebudiť obrazovku, keď dostanete upozornenie"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Vždy zapnuté"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Zobrazovať čas, ikony upozornení a ďalšie informácie"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Zväčšite alebo zmenšite text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky SIM karty"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f93b919..ccba470 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Preklop iz stanja pripravlj. z dviganjem"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Prikaz na podlagi okolja"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vedno vklopljeno"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obvestila"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nastavitve prikaza"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obvestila"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Preklop zaslona iz stanja pripravljenosti, ko prejmete obvestila"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Vedno vklopljeno"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Pokaži čas, ikone obvestil in druge informacije"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Pomanjšava ali povečava besedila"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 4f02d8f..ddc87e1 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ndriçimi automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ngrije për ta zgjuar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Shfaqja e ambientit"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Gjithmonë aktiv"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Njoftimet e reja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kur të shfaqet"</string>
     <string name="doze_title" msgid="2375510714460456687">"Njoftimet e reja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Zgjoje ekranin kur të merren njoftime"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Gjithmonë aktiv"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Shfaq orën, ikonat e njoftimeve dhe informacione të tjera"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Madhësa e shkrimit"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Bëje tekstin më të madh ose më të vogël"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Kyçja e kartës SIM"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 32ee301..204c23bb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1070,13 +1070,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигни за активацију"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Амбијентални екран"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Увек укључено"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нова обавештења"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Када да се приказује"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нова обавештења"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Пробудите екран када примите обавештења"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Увек укључено"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Приказује време, иконе обавештења и друге информације"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Омогућава да текст буде већи или мањи"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Закључавање SIM картице"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 228d84c..7b41d35 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Gå ur viloläget vid lyft"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv låsskärm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alltid på"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nya aviseringar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"När den ska visas"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nya aviseringar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivera skärmen när du får aviseringar"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Visa tid, aviseringsikoner och annan information"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gör texten större eller mindre."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0140faf..07b334a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Inua ili uondoe kifaa katika hali tuli"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Onyesho tulivu"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Imewashwa kila wakati"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Arifa mpya"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wakati wa kuonyesha"</string>
     <string name="doze_title" msgid="2375510714460456687">"Arifa mpya"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Washa skrini arifa zinapoingia"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Imewashwa kila wakati"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Onyesha saa, aikoni za arifa na maelezo mengine"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa fonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Kuongeza au kupunguza ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 396f815..795a280 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"தானாக ஒளிர்வைச் சரிசெய்தல்"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"விரலை எடுக்கும் போது இயங்கு"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"சூழல்சார் திரை"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"எப்போதும் இயக்கத்தில் வை"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"புதிய அறிவிப்புகள்"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"காட்டுவதற்கான நேரம்"</string>
     <string name="doze_title" msgid="2375510714460456687">"புதிய அறிவிப்புகள்"</string>
     <string name="doze_summary" msgid="3846219936142814032">"அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"எப்போதும் இயக்கத்தில் வை"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைக் காட்டும்"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index deb3cfb..9f864de 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"స్వయంచాలక ప్రకాశం"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"సక్రియం చేయడానికి వేళ్లను తీసివేయండి"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"యాంబియంట్ డిస్‌ప్లే"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ఎప్పుడు చూపాలి"</string>
     <string name="doze_title" msgid="2375510714460456687">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="doze_summary" msgid="3846219936142814032">"మీరు నోటిఫికేషన్‌లను స్వీకరించినప్పుడు స్క్రీన్‌ను సక్రియం చేస్తుంది"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"ప్రదర్శన సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారం"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ఫాంట్ పరిమాణం"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"వచనాన్ని పెద్దదిగా లేదా చిన్నదిగా చేస్తుంది"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bd26f54..97da015 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -856,7 +856,7 @@
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"เกตเวย์"</string>
-    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ความยาวของหมายเลขเครือข่าย"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ความยาวรหัสนำเครือข่าย"</string>
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WiFi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ข้อมูลอุปกรณ์"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"จำการเชื่อมต่อนี้"</string>
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ยกขึ้นเพื่อเวก"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"หน้าจอแอมเบียนท์"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"เปิดอยู่เสมอ"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"การแจ้งเตือนใหม่"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"แสดงเมื่อใด"</string>
     <string name="doze_title" msgid="2375510714460456687">"การแจ้งเตือนใหม่"</string>
     <string name="doze_summary" msgid="3846219936142814032">"เปิดหน้าจอเมื่อได้รับการแจ้งเตือน"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"เปิดใช้เสมอ"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"แสดงเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ทำให้ข้อความมีขนาดใหญ่ขึ้นหรือเล็กลง"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e8a898f..2c5cf69 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angatin upang paganahin"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient na display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Palaging naka-on"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Mga bagong notification"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kailan ipapakita"</string>
     <string name="doze_title" msgid="2375510714460456687">"Mga bagong notification"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Paganahin ang screen kapag nakatanggap ka ng mga notification"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Palaging naka-on"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Ipakita ang oras, mga icon ng notification, at iba pang impormasyon"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palakihin o paliitin ang text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setting ng lock ng SIM card"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 234121c..075bcc5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Kaldırarak uyandır"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ortam ekranı"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Her zaman açık"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yeni bildirimler"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Ne zaman gösterilecek?"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yeni bildirimler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirim geldiğinde ekranı uyandır"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Her zaman açık"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Saati, bildirim simgelerini ve diğer bilgileri göster"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Metni daha büyük veya daha küçük yapın"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f28c5c8..ff0220d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1082,13 +1082,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Підняти, щоб активувати"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Активація екрана"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Завжди ввімкнено"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нові сповіщення"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Час показу"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нові сповіщення"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Активувати екран, коли надходять сповіщення"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Завжди ввімкнено"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Показувати час, значки сповіщень тощо"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Збільшуйте або зменшуйте текст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налаштування блокування SIM-карти"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 22e716c..857f7c5 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ايمبيئنٹ ڈسپلے"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ہمیشہ آن"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"نئی اطلاعات"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"دکھانے کا وقت"</string>
     <string name="doze_title" msgid="2375510714460456687">"نئی اطلاعات"</string>
     <string name="doze_summary" msgid="3846219936142814032">"اطلاعات موصول ہونے پر اسکرین کو جگائیں"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ہمیشہ آن"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"وقت، اطلاعاتی آئیکنز اور دیگر معلومات دکھائیں"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"فونٹ سائز"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"متن کو چھوٹا یا بڑا کریں"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏SIM کارڈ لاک کی ترتیبات"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1d0d89d..e66f882 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1059,13 +1059,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik yorqinlik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tik holatda faollashtirish"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Sezgir ekran"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Har doim yoniq"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yangi bildirishnomalar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Qachon ko‘rsatilsin"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yangi bildirishnomalar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelganda ekran yonadi"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Har doim yoniq"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni ko‘rsatish"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Matnni kattalashtirish yoki kichiklashtirish"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9ebd134..69397d7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Nhấc lên để đánh thức"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Màn hình sáng"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Luôn bật"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Thông báo mới"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Thời điểm hiển thị"</string>
     <string name="doze_title" msgid="2375510714460456687">"Thông báo mới"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bật màn hình khi bạn nhận được thông báo"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Luôn bật"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Hiển thị thời gian, biểu tượng thông báo và các thông tin khác"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Phóng to hoặc thu nhỏ văn bản"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khóa thẻ SIM"</string>
@@ -1996,22 +1998,22 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Thường xuyên yêu cầu vị trí"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng hoạt động sai"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Dừng ứng dụng?"</string>
-    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> giữ điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> giữ máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> giữ thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> giữ điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> giữ máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> giữ thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục để điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục để máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục để thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục để điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục để máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục để thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"Dừng ứng dụng"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"Tắt sử dụng trong nền và dừng ứng dụng?"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> giữ điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> giữ máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> giữ thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục bật điện thoại của bạn.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục bật máy tính bảng của bạn.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục bật thiết bị của bạn.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Tắt"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Tắt vị trí?"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> không ngừng yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> không ngừng yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> không ngừng yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"Tắt"</string>
     <string name="power_screen" msgid="3023346080675904613">"Màn hình"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Đèn pin"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 61201f6..18dfaa9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"拿起设备时唤醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"主动显示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"始终开启"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"何时显示"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知时唤醒屏幕"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"始终开启"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"显示时间、通知图标和其他信息"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"放大或缩小文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM卡锁定设置"</string>
@@ -1996,35 +1998,22 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"请求获取位置信息的频率过高"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 个应用出现异常"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"要停止该应用吗？"</string>
-    <!-- no translation found for dialog_stop_message (4006631636646776488) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (2369957934555162428) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (6195430620406365292) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message_wakeup_alarm (1638726742782558262) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message_wakeup_alarm (8771690983566539742) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message_wakeup_alarm (2854944538238649520) -->
-    <skip />
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"由于<xliff:g id="APP">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"由于<xliff:g id="APP">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"由于<xliff:g id="APP">%1$s</xliff:g>一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"停止应用"</string>
-    <!-- no translation found for dialog_background_check_title (6936542136153283692) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (4045827746349279563) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (8348214419901788270) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (5847977433118915863) -->
-    <skip />
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"要关闭后台使用功能并停止应用吗？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>，并阻止该应用在后台运行。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>，并阻止该应用在后台运行。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>，并阻止该应用在后台运行。"</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"关闭"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"要禁止获取位置信息吗？"</string>
-    <!-- no translation found for dialog_location_message (7774807745601479888) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (118745801732181618) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (6783678153382298295) -->
-    <skip />
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"由于<xliff:g id="APP">%1$s</xliff:g>在您并未使用它时仍一直请求获取您的位置信息，因此您的手机无法正常管理电池。\n\n要解决此问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"由于<xliff:g id="APP">%1$s</xliff:g>在您并未使用它时仍一直请求获取您的位置信息，因此您的平板电脑无法正常管理电池。\n\n要解决此问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"由于<xliff:g id="APP">%1$s</xliff:g>在您并未使用它时仍一直请求获取您的位置信息，因此您的设备无法正常管理电池。\n\n要解决此问题，请关闭此应用的位置信息服务。"</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"关闭"</string>
     <string name="power_screen" msgid="3023346080675904613">"屏幕"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"手电筒"</string>
@@ -2797,8 +2786,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑动解锁, 密码, 图案, PIN 码"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"工作验证, 工作, 资料"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"工作资料, 托管资料, 汇整, 统一, 工作, 资料"</string>
-    <!-- no translation found for keywords_gesture (3526905012224714078) -->
-    <skip />
+    <string name="keywords_gesture" msgid="3526905012224714078">"手势"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、点按、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"备份内容, 备份"</string>
     <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"手势, 边缘, 侧边, active edge, 握紧, 握压, 持握, 辅助, 智能助理, 压握, 握紧, 挤压, 紧握, Ok Google, Google 智能助理"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 06a6528..d2253d9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"永遠開啟"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"何時顯示"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"永遠開啟"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"顯示時間、通知圖示和其他資料"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"放大或縮小文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a67b874..c1c5158 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"一律開啟"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"顯示時機"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"一律開啟"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"顯示時間、通知圖示和其他資訊"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"縮小或放大文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6792f94..d461d1a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1058,13 +1058,15 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ilifti yokuvuka"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Isibonisi esi-Ambient"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Njalo ivuliwe"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
+    <skip />
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Izaziso ezintsha"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kuboniswa nini"</string>
     <string name="doze_title" msgid="2375510714460456687">"Izaziso ezintsha"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vusa isikrini uma uthola izaziso"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Njalo ivuliwe"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Isikhathi sokubonisa, izithonjana zesazsizo, nolunye ulwazi"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Yenza umbhalo ube mkhulu noma ube mncane"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7f4cb79..3e80ab4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -112,4 +112,8 @@
 
     <!-- The fallback color for tinting icons. Only used when colorControlNormal is unavailable -->
     <color name="fallback_tintColor">#89000000</color>
+
+    <!-- Suggestion/condition colors -->
+    <color name="suggestion_condition_background">#f2f2f2</color>
+    <color name="condition_card_background">#f8f8f8</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e26c391..8e570dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1700,6 +1700,8 @@
     <string name="wifi_wakeup_summary">Wi\u2011Fi will turn back on near high\u2011quality saved networks, like your home network</string>
     <!-- Checkbox summary for Wi-Fi wakeup option to explain that Wi-Fi wakeup is disabled because Wi-Fi scanning is turned off -->
     <string name="wifi_wakeup_summary_scanning_disabled">Unavailable because Wi\u2011Fi scanning is turned off</string>
+    <!-- Checkbox summary for Wi-Fi wakeup option to explain that a network rating provider needs to be selected to use the feature. -->
+    <string name="wifi_wakeup_summary_scoring_disabled">To use, select a network rating provider</string>
     <!-- Checkbox title for option to toggle poor network detection -->
     <string name="wifi_poor_network_detection">Avoid poor connections</string>
     <!-- Checkbox summary for option to toggle poor network detection -->
@@ -1710,6 +1712,10 @@
     <string name="use_open_wifi_automatically_title">Connect to open networks</string>
     <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
     <string name="use_open_wifi_automatically_summary">Automatically connect to high\u2011quality public networks</string>
+    <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a network rating provider needs to be selected to use the feature. -->
+    <string name="use_open_wifi_automatically_summary_scoring_disabled">To use, select a network rating provider</string>
+    <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a compatible network rating provider needs to be selected to use the feature. -->
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled">To use, select a compatible network rating provider</string>
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi
@@ -6512,9 +6518,7 @@
     <string name="keywords_gesture">gestures</string>
     <string name="keywords_payment_settings">pay, tap, payments</string>
     <string name="keywords_backup">backup, back up</string>
-    <string name="keywords_squeeze_to_launch_gesture">gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant</string>
-    <string name="keywords_wake_squeeze_gesture">gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip</string>
-    <string name="keywords_alarm_silence_gesture">gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop</string>
+    <string name="keywords_assist_gesture_launch">gesture</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -8686,14 +8690,8 @@
     <!-- Summary for settings suggestion for fingerprint swipe for notifications [CHAR LIMIT=60] -->
     <string name="fingerprint_swipe_for_notifications_suggestion_summary">Swipe down on the fingerprint sensor</string>
 
-    <!-- Title text for the assist gesture [CHAR LIMIT=60]-->
-    <string name="assist_gesture_title">Assist gesture</string>
-
-    <!-- Summary text for the assist gesture [CHAR LIMIT=160]-->
-    <string name="assist_gesture_summary"></string>
-
-    <!-- Title text for the assist gesture sensitivity setting [CHAR LIMIT=NONE]-->
-    <string name="assist_gesture_sensitivity_title">Sensitivity</string>
+    <!-- Title text for the assist gesture [CHAR LIMIT=60] DO NOT TRANSLATE -->
+    <string name="assist_gesture_title" translatable="false"></string>
 
     <!-- Switch text for each gesture setting state -->
     <string name="gesture_setting_on">On</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 43177ff..fee7c74 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -456,7 +456,7 @@
     </style>
 
     <style name="SuggestionConditionStyle">
-        <item name="android:background">@color/material_grey_300</item>
+        <item name="android:background">@color/suggestion_condition_background</item>
     </style>
 
     <style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 31e2e79..8b5e7d3 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -49,6 +49,7 @@
         <item name="allowDividerAbove">false</item>
         <item name="allowDividerBelow">true</item>
         <item name="iconSpaceReserved">true</item>
+        <item name="singleLineTitle">false</item>
         <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
     </style>
 
@@ -72,6 +73,7 @@
         <item name="allowDividerAbove">false</item>
         <item name="allowDividerBelow">true</item>
         <item name="iconSpaceReserved">true</item>
+        <item name="singleLineTitle">false</item>
     </style>
 
     <style name="SyncSwitchPreference" parent="SettingsPreference">
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index cf84e8a..bdd799b 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -28,7 +28,6 @@
     <SwitchPreference
         android:key="gesture_assist"
         android:title="@string/assist_gesture_title"
-        android:summary="@string/assist_gesture_summary"
         app:keywords="@string/keywords_squeeze_to_launch_gesture"/>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 07632da..c0df50c 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -214,8 +214,9 @@
     }
 
     // Storage types. Used to determine what the extra item in the list of preferences is.
-    public static final int STORAGE_TYPE_DEFAULT = 0;
+    public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
     public static final int STORAGE_TYPE_MUSIC = 1;
+    public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.
 
     // sort order
     private int mSortOrder = R.id.sort_order_alpha;
@@ -433,7 +434,7 @@
         if (listType == LIST_TYPE_STORAGE) {
             if (storageType == STORAGE_TYPE_MUSIC) {
                 filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
-            } else {
+            } else if (storageType == STORAGE_TYPE_DEFAULT) {
                 filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
             }
             return filter;
diff --git a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
index 6d474ee..4d5692f 100644
--- a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
@@ -85,11 +85,8 @@
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (KEY_TOGGLE_BLUETOOTH.equals(preference.getKey())) {
-            final String fragmentClass = mBluetoothFeatureProvider.isPairingPageEnabled() ?
-                    BluetoothSettings.class.getName() :
-                    BluetoothSettingsObsolete.class.getName();
-            mActivity.startPreferencePanelAsUser(mFragment, fragmentClass, null, R.string.bluetooth,
-                    null, new UserHandle(UserHandle.myUserId()));
+            mActivity.startPreferencePanelAsUser(mFragment, BluetoothSettings.class.getName(), null,
+                    R.string.bluetooth, null, new UserHandle(UserHandle.myUserId()));
             return true;
         }
         return super.handlePreferenceTreeClick(preference);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 6545ed1..d7b86c5 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -70,10 +70,8 @@
     public void onStart() {
         super.onStart();
 
-        if (mLocalAdapter != null) {
-            updateContent(mLocalAdapter.getBluetoothState());
-            mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
-        }
+        updateContent(mLocalAdapter.getBluetoothState());
+        mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothSettingsObsolete.java b/src/com/android/settings/bluetooth/BluetoothSettingsObsolete.java
deleted file mode 100644
index 207d313..0000000
--- a/src/com/android/settings/bluetooth/BluetoothSettingsObsolete.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
-
-import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.BidiFormatter;
-import android.text.Spannable;
-import android.text.style.TextAppearanceSpan;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.LinkifyUtils;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceController;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.location.ScanningSettings;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.widget.GearPreference;
-import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
-import com.android.settings.widget.SwitchBar;
-import com.android.settings.widget.SwitchBarController;
-import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.widget.FooterPreference;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * BluetoothSettingsObsolete is the Settings screen for Bluetooth configuration and
- * connection management.
- *
- * This fragment stores old implementation of {@link BluetoothSettings} and is
- * deprecated, please use {@link BluetoothSettings} instead.
- */
-@Deprecated
-public class BluetoothSettingsObsolete extends DeviceListPreferenceObsoleteFragment
-        implements Indexable {
-    private static final String TAG = "BluetoothSettingsObsolete";
-
-    private static final int MENU_ID_SCAN = Menu.FIRST;
-    private static final int MENU_ID_SHOW_RECEIVED = Menu.FIRST + 1;
-
-    /* Private intent to show the list of received files */
-    private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
-            "android.btopp.intent.action.OPEN_RECEIVED_FILES";
-    private static final String BTOPP_PACKAGE =
-            "com.android.bluetooth";
-
-    private static final String KEY_PAIRED_DEVICES = "paired_devices";
-
-    private static View mSettingsDialogView = null;
-
-    private BluetoothEnabler mBluetoothEnabler;
-
-    private PreferenceGroup mPairedDevicesCategory;
-    private PreferenceGroup mAvailableDevicesCategory;
-    private Preference mDeviceNamePreference;
-    private boolean mAvailableDevicesCategoryIsPresent;
-
-    private boolean mInitialScanStarted;
-    private boolean mInitiateDiscoverable;
-
-    private SwitchBar mSwitchBar;
-
-    private final IntentFilter mIntentFilter;
-    private BluetoothDeviceNamePreferenceController mDeviceNamePrefController;
-
-    // For Search
-    @VisibleForTesting
-    static final String DATA_KEY_REFERENCE = "main_toggle_bluetooth_obsolete";
-
-    // accessed from inner class (not private to avoid thunks)
-    FooterPreference mMyDevicePreference;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            final int state =
-                    intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
-
-            if (state == BluetoothAdapter.STATE_ON) {
-                mInitiateDiscoverable = true;
-            }
-        }
-    };
-
-    public BluetoothSettingsObsolete() {
-        super(DISALLOW_CONFIG_BLUETOOTH);
-        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.BLUETOOTH;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mInitialScanStarted = false;
-        mInitiateDiscoverable = true;
-
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-        mSwitchBar = activity.getSwitchBar();
-
-        mBluetoothEnabler = new BluetoothEnabler(activity, new SwitchBarController(mSwitchBar),
-                mMetricsFeatureProvider, Utils.getLocalBtManager(activity),
-                MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
-        mBluetoothEnabler.setupSwitchController();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        mBluetoothEnabler.teardownSwitchController();
-    }
-
-    @Override
-    void addPreferencesForActivity() {
-        final Context prefContext = getPrefContext();
-
-        mDeviceNamePreference = mDeviceNamePrefController.createBluetoothDeviceNamePreference(
-                getPreferenceScreen(), 1 /* order */);
-
-        mPairedDevicesCategory = new PreferenceCategory(prefContext);
-        mPairedDevicesCategory.setKey(KEY_PAIRED_DEVICES);
-        mPairedDevicesCategory.setOrder(2);
-        getPreferenceScreen().addPreference(mPairedDevicesCategory);
-
-        mAvailableDevicesCategory = new BluetoothProgressCategory(prefContext);
-        mAvailableDevicesCategory.setSelectable(false);
-        mAvailableDevicesCategory.setOrder(3);
-        getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-
-        mMyDevicePreference = mFooterPreferenceMixin.createFooterPreference();
-        mMyDevicePreference.setSelectable(false);
-
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onStart() {
-        // resume BluetoothEnabler before calling super.onStart() so we don't get
-        // any onDeviceAdded() callbacks before setting up view in updateContent()
-        if (mBluetoothEnabler != null) {
-            mBluetoothEnabler.resume(getActivity());
-        }
-        super.onStart();
-
-        mInitiateDiscoverable = true;
-
-        if (isUiRestricted()) {
-            setDeviceListGroup(getPreferenceScreen());
-            if (!isUiRestrictedByOnlyAdmin()) {
-                getEmptyTextView().setText(R.string.bluetooth_empty_list_user_restricted);
-            }
-            removeAllDevices();
-            return;
-        }
-
-        getActivity().registerReceiver(mReceiver, mIntentFilter);
-        if (mLocalAdapter != null) {
-            updateContent(mLocalAdapter.getBluetoothState());
-        }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mBluetoothEnabler != null) {
-            mBluetoothEnabler.pause();
-        }
-
-        // Make the device only visible to connected devices.
-        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
-
-        if (isUiRestricted()) {
-            return;
-        }
-
-        getActivity().unregisterReceiver(mReceiver);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mLocalAdapter == null) return;
-        // If the user is not allowed to configure bluetooth, do not show the menu.
-        if (isUiRestricted()) return;
-
-        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
-        boolean isDiscovering = mLocalAdapter.isDiscovering();
-        int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
-                R.string.bluetooth_search_for_devices;
-        menu.add(Menu.NONE, MENU_ID_SCAN, 0, textId)
-                .setEnabled(bluetoothIsEnabled && !isDiscovering)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        menu.add(Menu.NONE, MENU_ID_SHOW_RECEIVED, 0, R.string.bluetooth_show_received_files)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_ID_SCAN:
-                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
-                    mMetricsFeatureProvider.action(getActivity(),
-                            MetricsEvent.ACTION_BLUETOOTH_SCAN);
-                    startScanning();
-                }
-                return true;
-
-            case MENU_ID_SHOW_RECEIVED:
-                mMetricsFeatureProvider.action(getActivity(),
-                        MetricsEvent.ACTION_BLUETOOTH_FILES);
-                Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
-                intent.setPackage(BTOPP_PACKAGE);
-                getActivity().sendBroadcast(intent);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void startScanning() {
-        if (isUiRestricted()) {
-            return;
-        }
-
-        if (!mAvailableDevicesCategoryIsPresent) {
-            getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-            mAvailableDevicesCategoryIsPresent = true;
-        }
-
-        if (mAvailableDevicesCategory != null) {
-            setDeviceListGroup(mAvailableDevicesCategory);
-            removeAllDevices();
-        }
-
-        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
-        mAvailableDevicesCategory.removeAll();
-        mInitialScanStarted = true;
-        mLocalAdapter.startScanning(true);
-    }
-
-    @Override
-    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
-        mLocalAdapter.stopScanning();
-        super.onDevicePreferenceClick(btPreference);
-    }
-
-    private void addDeviceCategory(PreferenceGroup preferenceGroup, int titleId,
-            BluetoothDeviceFilter.Filter filter, boolean addCachedDevices) {
-        cacheRemoveAllPrefs(preferenceGroup);
-        preferenceGroup.setTitle(titleId);
-        setFilter(filter);
-        setDeviceListGroup(preferenceGroup);
-        if (addCachedDevices) {
-            addCachedDevices();
-        }
-        preferenceGroup.setEnabled(true);
-        removeCachedPrefs(preferenceGroup);
-    }
-
-    private void updateContent(int bluetoothState) {
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        int messageId = 0;
-
-        switch (bluetoothState) {
-            case BluetoothAdapter.STATE_ON:
-                mDevicePreferenceMap.clear();
-
-                if (isUiRestricted()) {
-                    messageId = R.string.bluetooth_empty_list_user_restricted;
-                    break;
-                }
-                getPreferenceScreen().removeAll();
-                getPreferenceScreen().addPreference(mDeviceNamePreference);
-                getPreferenceScreen().addPreference(mPairedDevicesCategory);
-                getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-                getPreferenceScreen().addPreference(mMyDevicePreference);
-
-                // Paired devices category
-                addDeviceCategory(mPairedDevicesCategory,
-                        R.string.bluetooth_preference_paired_devices,
-                        BluetoothDeviceFilter.BONDED_DEVICE_FILTER, true);
-                int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount();
-
-                if (isUiRestricted() || numberOfPairedDevices <= 0) {
-                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) != null) {
-                        preferenceScreen.removePreference(mPairedDevicesCategory);
-                    }
-                } else {
-                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) == null) {
-                        preferenceScreen.addPreference(mPairedDevicesCategory);
-                    }
-                }
-
-                // Available devices category
-                addDeviceCategory(mAvailableDevicesCategory,
-                        R.string.bluetooth_preference_found_devices,
-                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);
-
-                if (!mInitialScanStarted) {
-                    startScanning();
-                }
-
-                updateMyDevicePreference(mMyDevicePreference);
-                getActivity().invalidateOptionsMenu();
-
-                // mLocalAdapter.setScanMode is internally synchronized so it is okay for multiple
-                // threads to execute.
-                if (mInitiateDiscoverable) {
-                    // Make the device visible to other devices.
-                    mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-                    mInitiateDiscoverable = false;
-                }
-                return; // not break
-
-            case BluetoothAdapter.STATE_TURNING_OFF:
-                messageId = R.string.bluetooth_turning_off;
-                break;
-
-            case BluetoothAdapter.STATE_OFF:
-                setOffMessage();
-                if (isUiRestricted()) {
-                    messageId = R.string.bluetooth_empty_list_user_restricted;
-                }
-                break;
-
-            case BluetoothAdapter.STATE_TURNING_ON:
-                messageId = R.string.bluetooth_turning_on;
-                mInitialScanStarted = false;
-                break;
-        }
-
-        setDeviceListGroup(preferenceScreen);
-        removeAllDevices();
-        if (messageId != 0) {
-            getEmptyTextView().setText(messageId);
-        }
-        if (!isUiRestricted()) {
-            getActivity().invalidateOptionsMenu();
-        }
-    }
-
-    private void setOffMessage() {
-        final TextView emptyView = getEmptyTextView();
-        if (emptyView == null) {
-            return;
-        }
-        final CharSequence briefText = getText(R.string.bluetooth_empty_list_bluetooth_off);
-
-        final ContentResolver resolver = getActivity().getContentResolver();
-        final boolean bleScanningMode = Settings.Global.getInt(
-                resolver, Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
-
-        if (!bleScanningMode) {
-            // Show only the brief text if the scanning mode has been turned off.
-            emptyView.setText(briefText, TextView.BufferType.SPANNABLE);
-        } else {
-            final StringBuilder contentBuilder = new StringBuilder();
-            contentBuilder.append(briefText);
-            contentBuilder.append("\n\n");
-            contentBuilder.append(getText(R.string.ble_scan_notify_text));
-            LinkifyUtils.linkify(emptyView, contentBuilder, new LinkifyUtils.OnClickListener() {
-                @Override
-                public void onClick() {
-                    final SettingsActivity activity =
-                            (SettingsActivity) BluetoothSettingsObsolete.this.getActivity();
-                    activity.startPreferencePanel(BluetoothSettingsObsolete.this,
-                            ScanningSettings.class.getName(), null,
-                            R.string.location_scanning_screen_title, null, null, 0);
-                }
-            });
-        }
-        getPreferenceScreen().removeAll();
-        setTextSpan(emptyView.getText(), briefText);
-    }
-
-    @Override
-    public void onBluetoothStateChanged(int bluetoothState) {
-        super.onBluetoothStateChanged(bluetoothState);
-        // If BT is turned off/on staying in the same BT Settings screen
-        // discoverability to be set again
-        if (BluetoothAdapter.STATE_ON == bluetoothState) {
-            mInitiateDiscoverable = true;
-        }
-        updateContent(bluetoothState);
-    }
-
-    @Override
-    public void onScanningStateChanged(boolean started) {
-        super.onScanningStateChanged(started);
-        // Update options' enabled state
-        if (getActivity() != null) {
-            getActivity().invalidateOptionsMenu();
-        }
-    }
-
-    @Override
-    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
-        setDeviceListGroup(getPreferenceScreen());
-        removeAllDevices();
-        updateContent(mLocalAdapter.getBluetoothState());
-    }
-
-    @VisibleForTesting
-    void setTextSpan(CharSequence text, CharSequence briefText) {
-        if (text instanceof Spannable) {
-            Spannable boldSpan = (Spannable) text;
-            boldSpan.setSpan(
-                    new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0,
-                    briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-    }
-
-    @VisibleForTesting
-    void updateMyDevicePreference(Preference myDevicePreference) {
-        final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
-
-        myDevicePreference.setTitle(getString(
-                R.string.bluetooth_footer_mac_message,
-                bidiFormatter.unicodeWrap(mLocalAdapter.getAddress())));
-    }
-
-    @VisibleForTesting
-    void setLocalBluetoothAdapter(LocalBluetoothAdapter localAdapter) {
-        mLocalAdapter = localAdapter;
-    }
-
-    private final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
-        // User clicked on advanced options icon for a device in the list
-        if (!(pref instanceof BluetoothDevicePreference)) {
-            Log.w(TAG, "onClick() called for other View: " + pref);
-            return;
-        }
-        final CachedBluetoothDevice device =
-                ((BluetoothDevicePreference) pref).getBluetoothDevice();
-        if (device == null) {
-            Log.w(TAG, "No BT device attached with this pref: " + pref);
-            return;
-        }
-        final Bundle args = new Bundle();
-        args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS,
-                device.getDevice().getAddress());
-        final DeviceProfilesSettings profileSettings = new DeviceProfilesSettings();
-        profileSettings.setArguments(args);
-        profileSettings.show(getFragmentManager(),
-                DeviceProfilesSettings.class.getSimpleName());
-    };
-
-    /**
-     * Add a listener, which enables the advanced settings icon.
-     *
-     * @param preference the newly added preference
-     */
-    @Override
-    void initDevicePreference(BluetoothDevicePreference preference) {
-        CachedBluetoothDevice cachedDevice = preference.getCachedDevice();
-        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
-            // Only paired device have an associated advanced settings screen
-            preference.setOnGearClickListener(mDeviceProfilesListener);
-        }
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_bluetooth;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.bluetooth_settings_obsolete;
-    }
-
-    @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        List<PreferenceController> controllers = new ArrayList<>();
-        mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context,
-                this, getLifecycle());
-        controllers.add(mDeviceNamePrefController);
-
-        return controllers;
-    }
-
-    @VisibleForTesting
-    static class SummaryProvider implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
-
-        private final LocalBluetoothManager mBluetoothManager;
-        private final Context mContext;
-        private final SummaryLoader mSummaryLoader;
-
-        @VisibleForTesting
-        BluetoothSummaryUpdater mSummaryUpdater;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader,
-                LocalBluetoothManager bluetoothManager) {
-            mBluetoothManager = bluetoothManager;
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-            mSummaryUpdater = new BluetoothSummaryUpdater(mContext, this, mBluetoothManager);
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            mSummaryUpdater.register(listening);
-        }
-
-        @Override
-        public void onSummaryChanged(String summary) {
-            if (mSummaryLoader != null) {
-                mSummaryLoader.setSummary(this, summary);
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                SummaryLoader summaryLoader) {
-
-            return new SummaryProvider(activity, summaryLoader, Utils.getLocalBtManager(activity));
-        }
-    };
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
-                        boolean enabled) {
-
-                    final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-
-                    final Resources res = context.getResources();
-
-                    // Add fragment title
-                    SearchIndexableRaw data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.bluetooth_settings);
-                    data.screenTitle = res.getString(R.string.bluetooth_settings);
-                    data.key = DATA_KEY_REFERENCE;
-                    result.add(data);
-
-                    // Add cached paired BT devices
-                    LocalBluetoothManager lbtm = Utils.getLocalBtManager(context);
-                    // LocalBluetoothManager.getInstance can return null if the device does not
-                    // support bluetooth (e.g. the emulator).
-                    if (lbtm != null) {
-                        Set<BluetoothDevice> bondedDevices =
-                                lbtm.getBluetoothAdapter().getBondedDevices();
-
-                        for (BluetoothDevice device : bondedDevices) {
-                            data = new SearchIndexableRaw(context);
-                            data.title = device.getName();
-                            data.screenTitle = res.getString(R.string.bluetooth_settings);
-                            data.enabled = enabled;
-                            result.add(data);
-                        }
-                    }
-                    return result;
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = super.getNonIndexableKeys(context);
-                    if (FeatureFactory.getFactory(context).getBluetoothFeatureProvider(
-                            context).isPairingPageEnabled()) {
-                        keys.add(DATA_KEY_REFERENCE);
-                    }
-                    return keys;
-                }
-
-            };
-}
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceObsoleteFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceObsoleteFragment.java
deleted file mode 100644
index 84d8558..0000000
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceObsoleteFragment.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-import android.util.Log;
-
-import com.android.settings.dashboard.RestrictedDashboardFragment;
-import com.android.settingslib.bluetooth.BluetoothCallback;
-import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import java.util.Collection;
-import java.util.WeakHashMap;
-
-/**
- * Parent class for settings fragments that contain a list of Bluetooth
- * devices.
- *
- * This fragment stores old implementation of {@link DeviceListPreferenceFragment} and is
- * deprecated, please use {@link DeviceListPreferenceFragment} instead.
- *
- * @see BluetoothSettingsObsolete
- * @see DevicePickerFragment
- */
-@Deprecated
-public abstract class DeviceListPreferenceObsoleteFragment extends
-        RestrictedDashboardFragment implements BluetoothCallback {
-
-    private static final String TAG = "DeviceListPreferenceFragment";
-
-    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
-    private static final String KEY_BT_SCAN = "bt_scan";
-
-    private BluetoothDeviceFilter.Filter mFilter;
-
-    BluetoothDevice mSelectedDevice;
-
-    LocalBluetoothAdapter mLocalAdapter;
-    LocalBluetoothManager mLocalManager;
-
-    private PreferenceGroup mDeviceListGroup;
-
-    final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
-            new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
-
-    DeviceListPreferenceObsoleteFragment(String restrictedKey) {
-        super(restrictedKey);
-        mFilter = BluetoothDeviceFilter.ALL_FILTER;
-    }
-
-    final void setFilter(BluetoothDeviceFilter.Filter filter) {
-        mFilter = filter;
-    }
-
-    final void setFilter(int filterType) {
-        mFilter = BluetoothDeviceFilter.getFilter(filterType);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mLocalManager = Utils.getLocalBtManager(getActivity());
-        if (mLocalManager == null) {
-            Log.e(TAG, "Bluetooth is not supported on this device");
-            return;
-        }
-        mLocalAdapter = mLocalManager.getBluetoothAdapter();
-
-        addPreferencesForActivity();
-
-        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
-    }
-
-    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
-        mDeviceListGroup = preferenceGroup;
-    }
-
-    /** Add preferences from the subclass. */
-    abstract void addPreferencesForActivity();
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        if (mLocalManager == null || isUiRestricted()) return;
-
-        mLocalManager.setForegroundActivity(getActivity());
-        mLocalManager.getEventManager().registerCallback(this);
-
-        updateProgressUi(mLocalAdapter.isDiscovering());
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mLocalManager == null || isUiRestricted()) {
-            return;
-        }
-
-        removeAllDevices();
-        mLocalManager.setForegroundActivity(null);
-        mLocalManager.getEventManager().unregisterCallback(this);
-    }
-
-    void removeAllDevices() {
-        mLocalAdapter.stopScanning();
-        mDevicePreferenceMap.clear();
-        mDeviceListGroup.removeAll();
-    }
-
-    void addCachedDevices() {
-        Collection<CachedBluetoothDevice> cachedDevices =
-                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
-        for (CachedBluetoothDevice cachedDevice : cachedDevices) {
-            onDeviceAdded(cachedDevice);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (KEY_BT_SCAN.equals(preference.getKey())) {
-            mLocalAdapter.startScanning(true);
-            return true;
-        }
-
-        if (preference instanceof BluetoothDevicePreference) {
-            BluetoothDevicePreference btPreference = (BluetoothDevicePreference) preference;
-            CachedBluetoothDevice device = btPreference.getCachedDevice();
-            mSelectedDevice = device.getDevice();
-            onDevicePreferenceClick(btPreference);
-            return true;
-        }
-
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
-        btPreference.onClicked();
-    }
-
-    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
-        if (mDevicePreferenceMap.get(cachedDevice) != null) {
-            return;
-        }
-
-        // Prevent updates while the list shows one of the state messages
-        if (mLocalAdapter.getBluetoothState() != BluetoothAdapter.STATE_ON) return;
-
-        if (mFilter.matches(cachedDevice.getDevice())) {
-            createDevicePreference(cachedDevice);
-        }
-    }
-
-    void createDevicePreference(CachedBluetoothDevice cachedDevice) {
-        if (mDeviceListGroup == null) {
-            Log.w(TAG, "Trying to create a device preference before the list group/category "
-                    + "exists!");
-            return;
-        }
-
-        String key = cachedDevice.getDevice().getAddress();
-        BluetoothDevicePreference preference = (BluetoothDevicePreference) getCachedPreference(key);
-
-        if (preference == null) {
-            preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice);
-            preference.setKey(key);
-            mDeviceListGroup.addPreference(preference);
-        } else {
-            // Tell the preference it is being re-used in case there is new info in the
-            // cached device.
-            preference.rebind();
-        }
-
-        initDevicePreference(preference);
-        mDevicePreferenceMap.put(cachedDevice, preference);
-    }
-
-    /**
-     * Overridden in {@link BluetoothSettings} to add a listener.
-     * @param preference the newly added preference
-     */
-    void initDevicePreference(BluetoothDevicePreference preference) {
-        // Does nothing by default
-    }
-
-    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
-        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
-        if (preference != null) {
-            mDeviceListGroup.removePreference(preference);
-        }
-    }
-
-    public void onScanningStateChanged(boolean started) {
-        updateProgressUi(started);
-    }
-
-    private void updateProgressUi(boolean start) {
-        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
-            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
-        }
-    }
-
-    public void onBluetoothStateChanged(int bluetoothState) {
-        if (bluetoothState == BluetoothAdapter.STATE_OFF) {
-            updateProgressUi(false);
-        }
-    }
-
-    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
-}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 35d7c28..6ff33ca 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -34,6 +34,7 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Space;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -267,27 +268,9 @@
                     (SuggestionAndConditionContainerHolder) holder, position);
                 break;
             case R.layout.suggestion_condition_header:
-                /* There are 2 different headers for the suggestions/conditions section. To minimize
-                   visual animation when expanding and collapsing the suggestions/conditions, we are
-                   using the same layout to represent the 2 headers:
-                   1. Suggestion header - when there is any suggestion shown, the suggestion header
-                      will be the first item on the section. It only has the text "Suggestion", and
-                      do nothing when clicked. This header will not be shown when the section is
-                      collapsed, in which case, the SuggestionCondition header will be
-                      shown instead to show the summary info.
-                   2. SuggestionCondition header - the header that shows the summary info for the
-                      suggestion/condition that is currently hidden. It has the expand button to
-                      expand the section. */
-                if (mDashboardData.getDisplayableSuggestionCount() > 0
-                        && position == SUGGESTION_CONDITION_HEADER_POSITION
-                        && mDashboardData.getSuggestionConditionMode()
-                            != DashboardData.HEADER_MODE_COLLAPSED) {
-                    onBindSuggestionHeader((SuggestionAndConditionHeaderHolder) holder);
-                } else {
-                    onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
+                onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
                         (SuggestionConditionHeaderData)
-                            mDashboardData.getItemEntityByPosition(position));
-                }
+                                mDashboardData.getItemEntityByPosition(position));
                 break;
             case R.layout.suggestion_condition_footer:
                 holder.itemView.setOnClickListener(v -> {
@@ -374,17 +357,6 @@
         }
     }
 
-    private void onBindSuggestionHeader(final SuggestionAndConditionHeaderHolder holder) {
-        holder.title.setText(R.string.suggestions_title);
-        holder.title.setTextColor(Color.BLACK);
-        holder.icon.setVisibility(View.INVISIBLE);
-        holder.icons.removeAllViews();
-        holder.icons.setVisibility(View.INVISIBLE);
-        holder.summary.setVisibility(View.INVISIBLE);
-        holder.expandIndicator.setVisibility(View.INVISIBLE);
-        holder.itemView.setOnClickListener(null);
-    }
-
     @VisibleForTesting
     void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
             SuggestionConditionHeaderData data) {
@@ -444,8 +416,12 @@
         } else {
             holder.summary.setText(null);
         }
-        holder.summary.setVisibility(View.VISIBLE);
-        holder.expandIndicator.setVisibility(View.VISIBLE);
+
+        if (curMode == DashboardData.HEADER_MODE_COLLAPSED) {
+            holder.topSpace.setVisibility(View.VISIBLE);
+        } else {
+            holder.topSpace.setVisibility(View.GONE);
+        }
 
         holder.itemView.setOnClickListener(v -> {
             if (moreSuggestions ) {
@@ -468,9 +444,9 @@
     @VisibleForTesting
     void onBindConditionAndSuggestion(final SuggestionAndConditionContainerHolder holder,
             int position) {
-        // If there is suggestions to show, it will be at position 1
-        // position 0 is suggestion header.
-        if (position == (SUGGESTION_CONDITION_HEADER_POSITION + 1)
+        // If there is suggestions to show, it will be at position 0 as we don't show the suggestion
+        // header anymore.
+        if (position == (SUGGESTION_CONDITION_HEADER_POSITION)
                 && mDashboardData.getSuggestions() != null) {
             mSuggestionAdapter = new SuggestionAdapter(mContext, (List<Tile>)
                 mDashboardData.getItemEntityByPosition(position), mSuggestionsShownLogged);
@@ -572,11 +548,13 @@
     public static class SuggestionAndConditionHeaderHolder extends DashboardItemHolder {
         public final LinearLayout icons;
         public final ImageView expandIndicator;
+        public final Space topSpace;
 
         public SuggestionAndConditionHeaderHolder(View itemView) {
             super(itemView);
             icons = itemView.findViewById(id.additional_icons);
             expandIndicator = itemView.findViewById(id.expand_indicator);
+            topSpace = itemView.findViewById(id.top_space);
         }
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 7528fb5..8b04dfc 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -228,12 +228,14 @@
                 hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 0;
 
         resetCount();
-            /* Top suggestion/condition header. This will be present when there is any suggestion or
-             * condition to show, except in the case that there is only conditions to show and the
-             * mode is fully expanded. */
+            /* Top suggestion/condition header. This will be present when there is any suggestion
+             * and the mode is collapsed, or it only has conditions and the mode is not fully
+             * expanded. */
         countItem(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
-                R.layout.suggestion_condition_header, hasSuggestions
-                        || hasConditions && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED,
+                R.layout.suggestion_condition_header,
+                        hasSuggestions && mSuggestionConditionMode == HEADER_MODE_COLLAPSED
+                        || !hasSuggestions && hasConditions
+                                && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED,
                 NS_SUGGESTION_CONDITION);
 
             /* Suggestion container. This is the card view that contains the list of suggestions.
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 10df004..04da586 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -473,6 +473,9 @@
                         StorageUseActivity.class.getName());
                 args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
                 args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
+                args.putInt(
+                        ManageApplications.EXTRA_STORAGE_TYPE,
+                        ManageApplications.STORAGE_TYPE_LEGACY);
                 intent = Utils.onBuildStartFragmentIntent(getActivity(),
                         ManageApplications.class.getName(), args, null, R.string.apps_storage, null,
                         false, getMetricsCategory());
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index acd34f0..3e81fc7 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -88,9 +88,17 @@
                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
                 isChecked ? 1 : 0);
 
-        boolean storageManagerEnabledByDefault = SystemProperties.getBoolean(
-                STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
-        if (isChecked && !storageManagerEnabledByDefault) {
+        final boolean storageManagerEnabledByDefault =
+                SystemProperties.getBoolean(STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
+        final boolean storageManagerDisabledByPolicy =
+                Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
+                                0)
+                        != 0;
+        // Show warning if it is disabled by default and turning it on or if it was disabled by
+        // policy and we're turning it on.
+        if ((isChecked && (!storageManagerEnabledByDefault || storageManagerDisabledByPolicy))) {
             ActivationWarningFragment fragment = ActivationWarningFragment.newInstance();
             fragment.show(mFragmentManager, ActivationWarningFragment.TAG);
         }
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index bed04d3..5f97608 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -34,11 +34,17 @@
     private static final int MY_USER = UserHandle.myUserId();
 
     private final AmbientDisplayConfiguration mConfig;
+    private final OnPreferenceChangedCallback mCallback;
+
+    public interface OnPreferenceChangedCallback {
+        void onPreferenceChanged();
+    }
 
     public AmbientDisplayAlwaysOnPreferenceController(Context context,
-            AmbientDisplayConfiguration config) {
+            AmbientDisplayConfiguration config, OnPreferenceChangedCallback callback) {
         super(context);
         mConfig = config;
+        mCallback = callback;
     }
 
     @Override
@@ -55,6 +61,9 @@
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         int enabled = (boolean) newValue ? 1 : 0;
         Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ALWAYS_ON, enabled);
+        if (mCallback != null) {
+            mCallback.onPreferenceChanged();
+        }
         return true;
     }
 
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
index 011cccb..666d47a6 100644
--- a/src/com/android/settings/display/AmbientDisplaySettings.java
+++ b/src/com/android/settings/display/AmbientDisplaySettings.java
@@ -51,11 +51,13 @@
 
     private static List<PreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle, AmbientDisplayConfiguration config,
-            MetricsFeatureProvider metricsFeatureProvider) {
+            MetricsFeatureProvider metricsFeatureProvider,
+            AmbientDisplayAlwaysOnPreferenceController.OnPreferenceChangedCallback aodCallback) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
                 metricsFeatureProvider));
-        controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config));
+        controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config,
+                aodCallback));
         controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle, config,
                 MY_USER_ID, KEY_AMBIENT_DISPLAY_DOUBLE_TAP));
         controllers.add(new PickupGesturePreferenceController(context, lifecycle, config,
@@ -77,7 +79,8 @@
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle(),
-                new AmbientDisplayConfiguration(context), mMetricsFeatureProvider);
+                new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
+                () -> { updatePreferenceStates(); });
     }
 
     @Override
@@ -101,7 +104,7 @@
                 @Override
                 public List<PreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null,
-                            new AmbientDisplayConfiguration(context), null);
+                            new AmbientDisplayConfiguration(context), null, null);
                 }
             };
 }
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java
index 5526cc9..aa3fc39 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java
@@ -38,6 +38,7 @@
         super(context);
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_BACKGROUND_CHECK;
+        mBatteryUtils = BatteryUtils.getInstance(context);
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index e647bf3..a5df949 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -61,6 +61,8 @@
                         ? R.string.gesture_setting_on
                         : R.string.gesture_setting_off);
             }
+            // Different meanings of "Enabled" for the Preference and Controller.
+            preference.setEnabled(canHandleClicks());
         }
     }
 
@@ -81,4 +83,8 @@
     protected abstract String getVideoPrefKey();
 
     protected abstract boolean isSwitchPrefEnabled();
+
+    protected boolean canHandleClicks() {
+        return true;
+    }
 }
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index 6308b37..9b36b7c 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -76,4 +76,9 @@
                 Settings.Secure.DOZE_PULSE_ON_PICK_UP, enabled ? 1 : 0);
         return true;
     }
+
+    @Override
+    public boolean canHandleClicks() {
+        return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
+    }
 }
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
index e4d4ca0..da7f299 100644
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -26,6 +26,9 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineListPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -120,4 +123,16 @@
         }
         return 0;
     }
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                LocationSettings.class.getName(), KEY_LOCATION,
+                mContext.getString(R.string.location_settings_title));
+
+        return new InlineListPayload(Secure.LOCATION_MODE,
+                ResultPayload.SettingsSource.SECURE, intent, isAvailable(),
+                Secure.LOCATION_MODE_HIGH_ACCURACY + 1);
+    }
+
 }
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 31a8526..b865ea5 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -25,6 +25,7 @@
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -37,6 +38,7 @@
 import com.android.settings.core.PreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -44,11 +46,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
+
 import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
 import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
 public class TetherPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume, OnPause, OnDestroy {
+        implements LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy {
 
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
 
@@ -56,7 +59,8 @@
     private final AtomicReference<BluetoothPan> mBluetoothPan;
     private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
-    private final BluetoothProfile.ServiceListener mBtProfileServiceListener =
+    @VisibleForTesting
+    final BluetoothProfile.ServiceListener mBtProfileServiceListener =
             new android.bluetooth.BluetoothProfile.ServiceListener() {
                 public void onServiceConnected(int profile, BluetoothProfile proxy) {
                     mBluetoothPan.set((BluetoothPan) proxy);
@@ -92,10 +96,6 @@
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
-        if (mBluetoothAdapter != null) {
-            mBluetoothAdapter.getProfileProxy(context, mBtProfileServiceListener,
-                    BluetoothProfile.PAN);
-        }
     }
 
     @Override
@@ -131,6 +131,14 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (mBluetoothAdapter != null) {
+            mBluetoothAdapter.getProfileProxy(mContext, mBtProfileServiceListener,
+                    BluetoothProfile.PAN);
+        }
+    }
+
+    @Override
     public void onResume() {
         if (mAirplaneModeObserver == null) {
             mAirplaneModeObserver = new SettingObserver();
@@ -139,7 +147,7 @@
             mTetherReceiver = new TetherBroadcastReceiver();
         }
         mContext.registerReceiver(
-            mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+                mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
         mContext.getContentResolver()
                 .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
     }
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 0f50375..239b6cd 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -202,7 +202,7 @@
         private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-        private Stage mUiStage = Stage.Introduction;
+        protected Stage mUiStage = Stage.Introduction;
         private PasswordRequirementAdapter mPasswordRequirementAdapter;
         private GlifLayout mLayout;
         protected boolean mForFingerprint;
@@ -820,7 +820,7 @@
         /**
          * Update the hint based on current Stage and length of password entry
          */
-        private void updateUi() {
+        protected void updateUi() {
             final boolean canInput = mSaveAndFinishWorker == null;
             String password = mPasswordEntry.getText().toString();
             final int length = password.length();
diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java
index 8a7028e..2988f52 100644
--- a/src/com/android/settings/password/SetupChooseLockPassword.java
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -18,9 +18,12 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -42,6 +45,8 @@
  */
 public class SetupChooseLockPassword extends ChooseLockPassword {
 
+    private static final String TAG = "SetupChooseLockPassword";
+
     public static Intent modifyIntentForSetup(
             Context context,
             Intent chooseLockPasswordIntent) {
@@ -73,6 +78,9 @@
         @VisibleForTesting
         static final int REQUEST_SCREEN_LOCK_OPTIONS = 1;
 
+        @Nullable
+        private Button mOptionsButton;
+
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
@@ -83,12 +91,22 @@
                 mCancelButton.setText(R.string.skip_label);
             }
 
-            boolean showOptionsButton = getActivity().getIntent().getBooleanExtra(
+            final Activity activity = getActivity();
+            ChooseLockGenericController chooseLockGenericController =
+                    new ChooseLockGenericController(activity, mUserId);
+            boolean anyOptionsShown = chooseLockGenericController.getVisibleScreenLockTypes(
+                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false).size() > 0;
+            boolean showOptionsButton = activity.getIntent().getBooleanExtra(
                     ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
-            if (showOptionsButton) {
-                Button optionsButton = view.findViewById(R.id.screen_lock_options);
-                optionsButton.setVisibility(View.VISIBLE);
-                optionsButton.setOnClickListener(this);
+
+            if (!anyOptionsShown) {
+                Log.w(TAG, "Visible screen lock types is empty!");
+            }
+
+            if (showOptionsButton && anyOptionsShown) {
+                mOptionsButton = view.findViewById(R.id.screen_lock_options);
+                mOptionsButton.setVisibility(View.VISIBLE);
+                mOptionsButton.setOnClickListener(this);
             }
         }
 
@@ -168,5 +186,14 @@
                 }
             }
         }
+
+        @Override
+        protected void updateUi() {
+            super.updateUi();
+            if (mOptionsButton != null) {
+                mOptionsButton.setVisibility(
+                        mUiStage == Stage.Introduction ? View.VISIBLE : View.GONE);
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 09080d3..9b84bf1 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -41,7 +41,6 @@
 import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.backup.BackupSettingsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.bluetooth.BluetoothSettingsObsolete;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.support.SupportDashboardActivity;
 import com.android.settings.datausage.DataUsageMeteredSettings;
@@ -133,7 +132,6 @@
         addIndex(SavedAccessPointsWifiSettings.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_wireless);
         addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);
-        addIndex(BluetoothSettingsObsolete.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);
         addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);
         addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index a50a1d9..c3aaba5 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.wifi;
 
-import static android.content.Context.NETWORK_SCORE_SERVICE;
 import static android.content.Context.WIFI_SERVICE;
 
 import android.content.Context;
@@ -26,7 +25,6 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkScoreManagerWrapper;
@@ -44,6 +42,7 @@
 
     private static final String TAG = "ConfigureWifiSettings";
 
+    private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
     private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
 
     @Override
@@ -59,8 +58,14 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(
-            mUseOpenWifiPreferenceController.isAvailable() ? 3 : 2);
+        int tileLimit = 1;
+        if (mWifiWakeupPreferenceController.isAvailable()) {
+            tileLimit++;
+        }
+        if (mUseOpenWifiPreferenceController.isAvailable()) {
+            tileLimit++;
+        }
+        mProgressiveDisclosureMixin.setTileLimit(tileLimit);
     }
 
     @Override
@@ -72,11 +77,13 @@
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final NetworkScoreManagerWrapper networkScoreManagerWrapper =
                 new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
+        mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(
+                context, getLifecycle(), networkScoreManagerWrapper);
         mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
                 networkScoreManagerWrapper, getLifecycle());
         final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new WifiWakeupPreferenceController(context, getLifecycle()));
+        controllers.add(mWifiWakeupPreferenceController);
         controllers.add(new NetworkScorerPickerPreferenceController(context,
                 networkScoreManagerWrapper));
         controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index 37cd692..cea4d46 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -8,7 +8,6 @@
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.net.NetworkScoreManager;
-
 import android.net.NetworkScorerAppData;
 import android.net.Uri;
 import android.os.Handler;
@@ -20,13 +19,16 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import com.android.settings.network.NetworkScoreManagerWrapper;
+import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
+import java.util.List;
+
 /**
  * {@link PreferenceController} that controls whether a user wants to enable the "use open networks
  * automatically" feature provider by the current network recommendation provider.
@@ -43,6 +45,7 @@
 
     private Preference mPreference;
     private ComponentName mEnableUseWifiComponentName;
+    private boolean mDoFeatureSupportedScorersExist;
 
     public UseOpenWifiPreferenceController(Context context, Fragment fragment,
             NetworkScoreManagerWrapper networkScoreManagerWrapper, Lifecycle lifecycle) {
@@ -52,6 +55,7 @@
         mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
         mSettingObserver = new SettingObserver();
         updateEnableUseWifiComponentName();
+        checkForFeatureSupportedScorers();
         lifecycle.addObserver(this);
     }
 
@@ -61,6 +65,21 @@
                 appData == null ? null : appData.getEnableUseOpenWifiActivity();
     }
 
+    private void checkForFeatureSupportedScorers() {
+        if (mEnableUseWifiComponentName != null) {
+            mDoFeatureSupportedScorersExist = true;
+            return;
+        }
+        List<NetworkScorerAppData> scorers = mNetworkScoreManagerWrapper.getAllValidScorers();
+        for (NetworkScorerAppData scorer : scorers) {
+            if (scorer.getEnableUseOpenWifiActivity() != null) {
+                mDoFeatureSupportedScorersExist = true;
+                return;
+            }
+        }
+        mDoFeatureSupportedScorersExist = false;
+    }
+
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
@@ -79,7 +98,7 @@
 
     @Override
     public boolean isAvailable() {
-        return mEnableUseWifiComponentName != null;
+        return mDoFeatureSupportedScorersExist;
     }
 
     @Override
@@ -93,8 +112,23 @@
             return;
         }
         final SwitchPreference useOpenWifiPreference = (SwitchPreference) preference;
-        useOpenWifiPreference.setVisible(isAvailable());
+
+        boolean isScorerSet = mNetworkScoreManagerWrapper.getActiveScorerPackage() != null;
+        boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;
+
         useOpenWifiPreference.setChecked(isSettingEnabled());
+        useOpenWifiPreference.setVisible(isAvailable());
+        useOpenWifiPreference.setEnabled(isScorerSet && doesActiveScorerSupportFeature);
+
+        if (!isScorerSet) {
+            useOpenWifiPreference.setSummary(
+                    R.string.use_open_wifi_automatically_summary_scoring_disabled);
+        } else if (!doesActiveScorerSupportFeature) {
+            useOpenWifiPreference.setSummary(
+                    R.string.use_open_wifi_automatically_summary_scorer_unsupported_disabled);
+        } else {
+            useOpenWifiPreference.setSummary(R.string.use_open_wifi_automatically_summary);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index 9ec4c59..f174b4f 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -29,6 +29,7 @@
 import com.android.settings.R;
 
 import com.android.settings.core.PreferenceController;
+import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -41,10 +42,13 @@
         LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
+    private final NetworkScoreManagerWrapper mNetworkScoreManager;
     private SettingObserver mSettingObserver;
 
-    public WifiWakeupPreferenceController(Context context, Lifecycle lifecycle) {
+    public WifiWakeupPreferenceController(
+            Context context, Lifecycle lifecycle, NetworkScoreManagerWrapper networkScoreManager) {
         super(context);
+        mNetworkScoreManager = networkScoreManager;
         lifecycle.addObserver(this);
     }
 
@@ -110,11 +114,17 @@
         boolean networkRecommendationsEnabled = Settings.Global.getInt(
                 mContext.getContentResolver(),
                 Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1;
-        enableWifiWakeup.setEnabled(networkRecommendationsEnabled && wifiScanningEnabled);
+        boolean activeScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
+        enableWifiWakeup.setEnabled(
+                networkRecommendationsEnabled && wifiScanningEnabled && activeScorerSet);
 
-        enableWifiWakeup.setSummary(wifiScanningEnabled ?
-                R.string.wifi_wakeup_summary :
-                R.string.wifi_wakeup_summary_scanning_disabled);
+        if (!activeScorerSet) {
+            enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
+        } else if (!wifiScanningEnabled) {
+            enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
+        } else {
+            enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary);
+        }
     }
 
     class SettingObserver extends ContentObserver {
diff --git a/tests/app/res/values-ky/strings.xml b/tests/app/res/values-ky/strings.xml
index a1136c9..766d591 100644
--- a/tests/app/res/values-ky/strings.xml
+++ b/tests/app/res/values-ky/strings.xml
@@ -19,10 +19,10 @@
     <string name="discoverable" msgid="5156521178072363663">"Ачык"</string>
     <string name="start_scan" msgid="3834980997400324437">"Скандоону баштоо"</string>
     <string name="stop_scan" msgid="4195720269023182612">"Скандоону токтотуу"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Салам, оператор!"</string>
+    <string name="operator_hello" msgid="5164036004953019483">"Салам!"</string>
     <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
     <string name="operator_settings_summary" msgid="8356150829172002728">"Тандалган аракетти баштоо үчүн колдонула турган оператордун куралы"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Салам, өндүрүүчү!"</string>
+    <string name="manufacturer_hello" msgid="5926168503597475062">"Салам!"</string>
     <string name="manufacturer_settings_title" msgid="3516742885166545864">"Өндүрүүчү"</string>
     <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Тандалган аракетти баштоо үчүн колдонула турган өндүрүүчүнүн куралы"</string>
 </resources>
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
index 7e3cd84..59ca483 100644
--- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -34,6 +34,10 @@
         return true;
     }
 
+    public boolean pulseOnPickupCanBeModified(int user) {
+        return true;
+    }
+
     public boolean pulseOnDoubleTapAvailable() {
         return true;
     }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
index ce78165..9634661 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
@@ -127,23 +127,4 @@
 
         verify(mPreference).setSummary("test summary");
     }
-
-    @Test
-    public void testHandlePreferenceTreeClick_pairPageEnabled_showNewPage() {
-        when(mFeatureFactory.bluetoothFeatureProvider.isPairingPageEnabled()).thenReturn(true);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mActivity).startPreferencePanelAsUser(eq(mFragment),
-                eq(BluetoothSettings.class.getName()), any(), eq(R.string.bluetooth), any(), any());
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_pairPageDisabled_showOldPage() {
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mActivity).startPreferencePanelAsUser(eq(mFragment),
-                eq(BluetoothSettingsObsolete.class.getName()), any(), eq(R.string.bluetooth), any(),
-                any());
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java
deleted file mode 100644
index 51c8b15..0000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothSettingsObsoleteTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private BluetoothSettingsObsolete mFragment;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mFragment = spy(new BluetoothSettingsObsolete());
-        doReturn(mContext).when(mFragment).getContext();
-    }
-
-    @Test
-    public void testSearchIndexProvider_pairPageEnabled_keyAdded() {
-        doReturn(true).when(mFeatureFactory.bluetoothFeatureProvider).isPairingPageEnabled();
-
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).contains(BluetoothSettingsObsolete.DATA_KEY_REFERENCE);
-    }
-
-    @Test
-    public void testSearchIndexProvider_pairPageDisabled_keyNotAdded() {
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).doesNotContain(BluetoothSettingsObsolete.DATA_KEY_REFERENCE);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 55bc4ca..5c23d60 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -386,7 +386,7 @@
                 new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
 
         mDashboardAdapter.onBindConditionAndSuggestion(
-                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION + 1);
+                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
 
         verify(data).setAdapter(any(SuggestionAdapter.class));
         // should not crash
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index 3b8672e..fdbbefb 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -112,10 +112,7 @@
 
     @Test
     public void testBuildItemsData_containsAllData() {
-        final DashboardData.SuggestionConditionHeaderData data =
-                new DashboardData.SuggestionConditionHeaderData(
-                    mDashboardDataWithOneConditions.getConditions(), 0);
-        final Object[] expectedObjects = {data,
+        final Object[] expectedObjects = {
             mDashboardDataWithOneConditions.getSuggestions(),
             mDashboardDataWithOneConditions.getConditions(),
             null, mDashboardCategory, mTestCategoryTile};
@@ -186,17 +183,13 @@
     }
 
     @Test
-    public void testDiffUtil_InsertOneCondition_ResultDataTwoChanged() {
+    public void testDiffUtil_InsertOneCondition_ResultDataOneChanged() {
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        // Item in position 1 is the header, which contains the number of conditions, changed from
-        // 1 to 2
-        testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 0, 1));
-        // Item in position 3 is the condition container containing the list of conditions, which
+        // Item in position 2 is the condition container containing the list of conditions, which
         // gets 1 more item
         testResultData.add(new ListUpdateResult.ResultData(
-            ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 2, 1));
+            ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
 
         testDiffUtil(mDashboardDataWithOneConditions,
                 mDashboardDataWithTwoConditions, testResultData);
@@ -207,7 +200,7 @@
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 6));
+                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 5));
 
         testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
     }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index 9bc1a3a..faf8b39 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -168,4 +168,23 @@
 
         verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG));
     }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
+        FragmentTransaction transaction = mock(FragmentTransaction.class);
+        when(mFragmentManager.beginTransaction()).thenReturn(transaction);
+        SettingsShadowSystemProperties.set(
+                AutomaticStorageManagementSwitchPreferenceController
+                        .STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY,
+                "true");
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
+                1);
+
+        mController.onSwitchToggled(true);
+
+        verify(transaction).add(any(), eq(ActivationWarningFragment.TAG));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index d38ac51..f01190a 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -48,11 +48,13 @@
     @Mock SwitchPreference mSwitchPreference;
 
     AmbientDisplayAlwaysOnPreferenceController mController;
+    boolean mCallbackInvoked;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig);
+        mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
+                () -> { mCallbackInvoked = true; });
     }
 
     @Test
@@ -76,6 +78,13 @@
     }
 
     @Test
+    public void onPreferenceChange_callback() throws Exception {
+        assertThat(mCallbackInvoked).isFalse();
+        mController.onPreferenceChange(mSwitchPreference, true);
+        assertThat(mCallbackInvoked).isTrue();
+    }
+
+    @Test
     public void onPreferenceChange_enable() throws Exception {
         mController.onPreferenceChange(mSwitchPreference, true);
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
index e2b8656..7e5fc4a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
@@ -94,4 +94,11 @@
 
         assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
     }
+
+    @Test
+    public void testConstructor_batteryUtilsNotNull() {
+        mBackgroundCheckAction = new BackgroundCheckAction(mContext);
+
+        assertThat(mBackgroundCheckAction.mBatteryUtils).isNotNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
index d81163d..1877200 100644
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
@@ -83,4 +83,18 @@
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
+
+    @Test
+    public void testCanHandleClicks_configIsSet_shouldReturnTrue() {
+        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(true);
+
+        assertThat(mController.canHandleClicks()).isTrue();
+    }
+
+    @Test
+    public void testCanHandleClicks_configIsNotSet_shouldReturnFalse() {
+        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(false);
+
+        assertThat(mController.canHandleClicks()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
index ea2a18b..c7e0e0a 100644
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.location;
 
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.nullable;
@@ -23,17 +24,25 @@
 import static org.mockito.Mockito.when;
 
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.location.LocationManager;
+import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.display.AutoBrightnessPreferenceController;
+import com.android.settings.search.InlineListPayload;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -42,7 +51,9 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -160,4 +171,38 @@
 
         verify(mPreference).setSummary(any());
     }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        final Context context = RuntimeEnvironment.application;
+        mController = new LocationPreferenceController(context, null /* lifecycle */);
+        ResultPayload payload = mController.getResultPayload();
+        assertThat(payload).isInstanceOf(InlineListPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = Secure.LOCATION_MODE_BATTERY_SAVING;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver, Secure.LOCATION_MODE,
+                Secure.LOCATION_MODE_OFF);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int expectedValue = Secure.LOCATION_MODE_BATTERY_SAVING;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, expectedValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(expectedValue);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 4ae8c2c..b8a6d28 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
@@ -78,6 +77,14 @@
     }
 
     @Test
+    public void lifeCycle_onCreate_shouldInitBluetoothPan() {
+        mController.onCreate(null);
+
+        verify(mBluetoothAdapter).getProfileProxy(mContext, mController.mBtProfileServiceListener,
+                BluetoothProfile.PAN);
+    }
+
+    @Test
     public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
         final BluetoothPan pan = mock(BluetoothPan.class);
         final AtomicReference<BluetoothPan> panRef =
@@ -161,7 +168,8 @@
         mController.onResume();
 
         verify(mContext).registerReceiver(
-            any(TetherPreferenceController.TetherBroadcastReceiver.class), any(IntentFilter.class));
+                any(TetherPreferenceController.TetherBroadcastReceiver.class),
+                any(IntentFilter.class));
     }
 
     @Test
@@ -172,7 +180,7 @@
         mController.onPause();
 
         verify(mContext).unregisterReceiver(
-            any(TetherPreferenceController.TetherBroadcastReceiver.class));
+                any(TetherPreferenceController.TetherBroadcastReceiver.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 5f4c16a..3e9c39c 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -24,6 +24,7 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Button;
 
 import com.android.settings.R;
@@ -42,11 +43,16 @@
 import org.robolectric.Robolectric;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowActivity.IntentForResult;
 import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowDialog;
 
+import java.util.Collections;
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
@@ -80,6 +86,15 @@
     }
 
     @Test
+    @Config(shadows = ShadowChooseLockGenericController.class)
+    public void createActivity_withShowOptionsButtonExtra_buttonNotVisibleIfNoVisibleLockTypes() {
+        SetupChooseLockPassword activity = createSetupChooseLockPassword();
+        Button optionsButton = activity.findViewById(R.id.screen_lock_options);
+        assertThat(optionsButton).isNotNull();
+        assertThat(optionsButton.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
     public void allSecurityOptions_shouldBeShown_When_OptionsButtonIsClicked() {
         SetupChooseLockPassword activity = createSetupChooseLockPassword();
         activity.findViewById(R.id.screen_lock_options).performClick();
@@ -122,4 +137,13 @@
         intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
         return Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
     }
+
+    @Implements(ChooseLockGenericController.class)
+    public static class ShadowChooseLockGenericController {
+        @Implementation
+        public List<ScreenLockType> getVisibleScreenLockTypes(int quality,
+                boolean includeDisabled) {
+            return Collections.emptyList();
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index 60d38b6..a76b82a 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -19,12 +19,12 @@
 import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE;
 import static com.android.settings.wifi.UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY;
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.ComponentName;
@@ -36,11 +36,13 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
+import com.android.settings.R;
+import com.android.settings.TestConfig;
 import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,10 +53,14 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UseOpenWifiPreferenceControllerTest {
-    private static ComponentName ENABLE_ACTIVITY_COMPONENT = new ComponentName("package", "activityClass");
+    private static ComponentName ENABLE_ACTIVITY_COMPONENT =
+            new ComponentName("package", "activityClass");
     private static NetworkScorerAppData APP_DATA =
             new NetworkScorerAppData(0, null, null, ENABLE_ACTIVITY_COMPONENT, null);
     private static NetworkScorerAppData APP_DATA_NO_ACTIVITY =
@@ -79,28 +85,45 @@
                 mContext, mFragment, mNetworkScoreManagerWrapper, mLifecycle);
     }
 
-    @Test
-    public void testIsAvailable_noScorer() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(null);
+    /**
+     * Sets the scorers.
+     * @param scorers list of scorers returned by {@link NetworkScoreManager#getAllValidScorers()}.
+     *                First scorer in the list is the active scorer.
+     */
+    private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
+        when(mNetworkScoreManagerWrapper.getActiveScorerPackage()).thenReturn(
+                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
+        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
+    }
 
+    @Test
+    public void testIsAvailable_returnsFalseWhenNoScorerSet() {
         createController();
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void testIsAvailable_noEnableActivity() {
+    public void testIsAvailable_returnsFalseWhenScorersNotSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
+        createController();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testIsAvailable_returnsTrueIfActiveScorerSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        createController();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailable_returnsTrueIfNonActiveScorerSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY, APP_DATA));
         when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
-
-        createController();
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_enableActivityExists() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
-
         createController();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -117,8 +140,6 @@
 
     @Test
     public void onPreferenceChange_notAvailable_shouldDoNothing() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
-
         createController();
 
         final Preference pref = new Preference(mContext);
@@ -129,7 +150,7 @@
 
     @Test
     public void onPreferenceChange_matchingKeyAndAvailable_enableShouldStartEnableActivity() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         final SwitchPreference pref = new SwitchPreference(mContext);
@@ -145,7 +166,7 @@
 
     @Test
     public void onPreferenceChange_matchingKeyAndAvailable_disableShouldUpdateSetting() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
                 ENABLE_ACTIVITY_COMPONENT.getPackageName());
 
@@ -161,6 +182,7 @@
 
     @Test
     public void onActivityResult_nonmatchingRequestCode_shouldDoNothing() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController.onActivityResult(234 /* requestCode */ , Activity.RESULT_OK))
@@ -171,6 +193,7 @@
 
     @Test
     public void onActivityResult_matchingRequestCode_nonOkResult_shouldDoNothing() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController
@@ -182,7 +205,7 @@
 
     @Test
     public void onActivityResult_matchingRequestCode_okResult_updatesSetting() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController
@@ -193,8 +216,8 @@
     }
 
     @Test
-    public void updateState_preferenceSetCheckedAndSetVisibleWhenSettingsAreEnabled() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+    public void updateState_noEnableActivity_preferenceDisabled_summaryChanged() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
         createController();
 
         final SwitchPreference preference = mock(SwitchPreference.class);
@@ -203,19 +226,39 @@
 
         mController.updateState(preference);
 
-        verify(preference).setVisible(true);
-        verify(preference).setChecked(true);
+        verify(preference).setChecked(false);
+        verify(preference).setSummary(
+                R.string.use_open_wifi_automatically_summary_scorer_unsupported_disabled);
     }
 
     @Test
-    public void updateState_preferenceSetCheckedAndSetVisibleWhenSettingsAreDisabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE, "");
+    public void updateState_noScorer_preferenceDisabled_summaryChanged() {
+        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(new ArrayList<>());
         createController();
 
+        final SwitchPreference preference = mock(SwitchPreference.class);
+        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
+                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+
         mController.updateState(preference);
 
-        verify(preference).setVisible(false);
         verify(preference).setChecked(false);
+        verify(preference).setSummary(
+                R.string.use_open_wifi_automatically_summary_scoring_disabled);
+    }
+
+    @Test
+    public void updateState_enableActivityExists_preferenceEnabled() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        createController();
+
+        final SwitchPreference preference = mock(SwitchPreference.class);
+        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
+                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+
+        mController.updateState(preference);
+
+        verify(preference).setChecked(true);
+        verify(preference).setSummary(R.string.use_open_wifi_automatically_summary);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 6fb0abd..8be686e 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.provider.Settings;
@@ -30,6 +31,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -39,6 +41,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -50,17 +53,23 @@
         shadows = { SettingsShadowResources.class })
 public class WifiWakeupPreferenceControllerTest {
 
+    private static final String TEST_SCORER_PACKAGE_NAME = "Test Scorer";
+
     private Context mContext;
+    @Mock
+    private NetworkScoreManagerWrapper mNetworkScorer;
     private WifiWakeupPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mController = new WifiWakeupPreferenceController(mContext, mock(Lifecycle.class));
+        mController = new WifiWakeupPreferenceController(
+                mContext, mock(Lifecycle.class), mNetworkScorer);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.integer.config_wifi_wakeup_available, 0);
+        when(mNetworkScorer.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_NAME);
     }
 
     @After
@@ -145,4 +154,18 @@
         verify(preference).setEnabled(false);
         verify(preference).setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
     }
+
+    @Test
+    public void updateState_preferenceSetUncheckedAndSetDisabledWhenScoringDisabled() {
+        final SwitchPreference preference = mock(SwitchPreference.class);
+        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
+        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+        when(mNetworkScorer.getActiveScorerPackage()).thenReturn(null);
+
+        mController.updateState(preference);
+
+        verify(preference).setChecked(true);
+        verify(preference).setEnabled(false);
+        verify(preference).setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
index c65f9ea..ce8603b 100644
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
@@ -116,4 +116,20 @@
 
         assertThat(composedFilter.filterApp(appEntry)).isTrue();
     }
+
+    @Test
+    public void getCompositeFilter_worksForLegacyPrivateSettings() throws Exception {
+        ApplicationsState.AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_STORAGE,
+                        ManageApplications.STORAGE_TYPE_LEGACY,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_GAME;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
 }