diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a1cb7ee..2eb2760 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1295,6 +1295,7 @@
         <activity android:name="MonitoringCertInfoActivity"
                 android:label="@string/ssl_ca_cert_dialog_title"
                 android:theme="@style/Transparent"
+                android:excludeFromRecents="true"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.MONITORING_CERT_INFO" />
@@ -1322,6 +1323,8 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.TrustedCredentialsSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
diff --git a/res/layout/admin_support_details_content.xml b/res/layout/admin_support_details_content.xml
index 52de743..7c756c4 100644
--- a/res/layout/admin_support_details_content.xml
+++ b/res/layout/admin_support_details_content.xml
@@ -20,7 +20,7 @@
             android:textAppearance="@android:style/TextAppearance.Material.Subhead"
             android:text="@string/default_admin_support_msg"
             android:maxLength="200"
-            android:autoLink="email|phone"
+            android:autoLink="email|phone|web"
             android:textColor="?android:attr/textColorSecondary" />
     <TextView android:id="@+id/admins_policies_list"
             android:layout_width="match_parent"
diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml
index d1563bf..df6248d 100644
--- a/res/layout/battery_history_detail.xml
+++ b/res/layout/battery_history_detail.xml
@@ -41,7 +41,7 @@
     <com.android.settingslib.graph.UsageView
         android:id="@+id/battery_usage"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="141dp"
         settings:sideLabels="@array/battery_labels"
         android:colorAccent="?android:attr/colorAccent"
         android:gravity="end"
diff --git a/res/layout/bugreport_options_dialog.xml b/res/layout/bugreport_options_dialog.xml
index d937bc3..fd00bc6 100644
--- a/res/layout/bugreport_options_dialog.xml
+++ b/res/layout/bugreport_options_dialog.xml
@@ -15,66 +15,68 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingStart="20dp"
-    android:paddingEnd="24dp"
-    android:paddingTop="15dp"
-    >
-
-    <CheckedTextView
-        android:id="@+id/bugreport_option_interactive_title"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical"
-        android:paddingEnd="?android:attr/dialogPreferredPadding"
-        android:text="@*android:string/bugreport_option_interactive_title"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorAlertDialogListItem" />
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingStart="20dp"
+        android:paddingEnd="24dp"
+        android:paddingTop="15dp"
+        >
 
-    <TextView
-        android:id="@+id/bugreport_option_interactive_summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/bugreport_option_interactive_title"
-        android:maxLines="10"
-        android:paddingBottom="10dp"
-        android:paddingStart="32dp"
-        android:paddingEnd="?android:attr/dialogPreferredPadding"
-        android:text="@*android:string/bugreport_option_interactive_summary"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary" />
+        <CheckedTextView
+            android:id="@+id/bugreport_option_interactive_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
+            android:ellipsize="marquee"
+            android:gravity="center_vertical"
+            android:paddingEnd="?android:attr/dialogPreferredPadding"
+            android:text="@*android:string/bugreport_option_interactive_title"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorAlertDialogListItem" />
 
-    <CheckedTextView
-        android:id="@+id/bugreport_option_full_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/bugreport_option_interactive_summary"
-        android:checked="false"
-        android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical"
-        android:paddingEnd="?android:attr/dialogPreferredPadding"
-        android:text="@*android:string/bugreport_option_full_title"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorAlertDialogListItem" />
+        <TextView
+            android:id="@+id/bugreport_option_interactive_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/bugreport_option_interactive_title"
+            android:maxLines="10"
+            android:paddingBottom="10dp"
+            android:paddingStart="32dp"
+            android:paddingEnd="?android:attr/dialogPreferredPadding"
+            android:text="@*android:string/bugreport_option_interactive_summary"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary" />
 
-    <TextView
-        android:id="@+id/bugreport_option_full_summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/bugreport_option_full_title"
-        android:maxLines="10"
-        android:paddingBottom="10dp"
-        android:paddingStart="32dp"
-        android:paddingEnd="?android:attr/dialogPreferredPadding"
-        android:text="@*android:string/bugreport_option_full_summary"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary" />
+        <CheckedTextView
+            android:id="@+id/bugreport_option_full_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/bugreport_option_interactive_summary"
+            android:checked="false"
+            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
+            android:ellipsize="marquee"
+            android:gravity="center_vertical"
+            android:paddingEnd="?android:attr/dialogPreferredPadding"
+            android:text="@*android:string/bugreport_option_full_title"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorAlertDialogListItem" />
 
-</RelativeLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/bugreport_option_full_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/bugreport_option_full_title"
+            android:maxLines="10"
+            android:paddingBottom="10dp"
+            android:paddingStart="32dp"
+            android:paddingEnd="?android:attr/dialogPreferredPadding"
+            android:text="@*android:string/bugreport_option_full_summary"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary" />
+
+    </RelativeLayout>
+</ScrollView>
diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml
index 6a08d55..0e480a5 100644
--- a/res/layout/condition_card.xml
+++ b/res/layout/condition_card.xml
@@ -27,7 +27,7 @@
         android:orientation="vertical"
         android:paddingStart="16dp"
         android:background="?android:attr/colorAccent"
-        android:elevation="3dp"
+        android:elevation="2dp"
         android:clickable="true">
 
         <LinearLayout
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index b104f07..536617d 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -59,9 +59,15 @@
             android:layout_marginEnd="16dp"
             android:layout_marginTop="16dp"/>
 
-        <View android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/strongAuthRequiredText"
+            style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:gravity="center"/>
 
         <EditText
             android:id="@+id/password_entry"
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index c188ccf..117c499 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -59,9 +59,15 @@
             android:layout_marginEnd="16dp"
             android:layout_marginTop="16dp"/>
 
-        <View android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/strongAuthRequiredText"
+            style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="0.5"/>
+            android:layout_weight="0.5"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:gravity="center"/>
 
         <com.android.internal.widget.LockPatternView
             android:id="@+id/lockPattern"
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 0a7aed9..b3500b2 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -23,11 +23,6 @@
     android:background="@color/card_background"
     android:importantForAccessibility="noHideDescendants">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/listDivider" />
-
     <TextView android:id="@android:id/title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/dashboard_spacer.xml b/res/layout/dashboard_spacer.xml
index d7d9717..19ef8ff 100644
--- a/res/layout/dashboard_spacer.xml
+++ b/res/layout/dashboard_spacer.xml
@@ -16,4 +16,4 @@
 
 <View xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="10dp" />
+        android:layout_height="6dp" />
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index cd7c8ee..983e6ea 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -15,57 +15,40 @@
 -->
 
 <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/dashboard_tile_minimum_height"
-        android:clickable="true"
-        android:background="@drawable/selectable_card" >
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/dashboard_tile_minimum_height"
+    android:clickable="true"
+    android:background="@drawable/selectable_card" >
 
     <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/dashboard_tile_image_size"
-            android:layout_height="@dimen/dashboard_tile_image_size"
-            android:scaleType="centerInside"
-            android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-            android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/dashboard_tile_image_size"
+        android:layout_height="@dimen/dashboard_tile_image_size"
+        android:scaleType="centerInside"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:orientation="vertical"
-            android:gravity="center_vertical"
-            android:layout_weight="1">
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.TileTitle"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
 
-            <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                <TextView android:id="@android:id/title"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:textAppearance="@style/TextAppearance.TileTitle"
-                          android:ellipsize="marquee"
-                          android:fadingEdge="horizontal" />
-
-                <TextView android:id="@android:id/summary"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_below="@android:id/title"
-                          android:layout_alignStart="@android:id/title"
-                          android:textAppearance="@style/TextAppearance.Small"
-                          android:textColor="?android:attr/textColorSecondary" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
+        <TextView android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Small"
+            android:textColor="?android:attr/textColorSecondary" />
 
     </LinearLayout>
 
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index a15a962..034075b 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -118,7 +118,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:autoLink="email|phone"
+                    android:autoLink="email|phone|web"
                     android:padding="10dip" />
             </LinearLayout>
 
diff --git a/res/layout/preview_seek_bar_view_pager.xml b/res/layout/preview_seek_bar_view_pager.xml
index 66b492c..e24b674 100644
--- a/res/layout/preview_seek_bar_view_pager.xml
+++ b/res/layout/preview_seek_bar_view_pager.xml
@@ -39,6 +39,6 @@
         android:text="@string/screen_zoom_preview_title"
         android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
         android:textColor="@color/seek_bar_preference_preview_text"
-        android:accessibilityTraversalBefore="@id/preview_pager"/>
+        android:importantForAccessibility="no" />
 </LinearLayout>
 
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 16bf0f6..834bba2 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -19,9 +19,11 @@
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
-    <LinearLayout style="@style/info_layout">
+    <LinearLayout style="@style/info_layout"
+        android:descendantFocusability="beforeDescendants"
+        android:focusableInTouchMode="true">
 
         <!-- IMEI -->
         <LinearLayout style="@style/entry_layout">
@@ -41,6 +43,67 @@
             <TextView android:id="@+id/operator" style="@style/info_value" />
         </LinearLayout>
 
+        <!-- Signal Strength -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_signal_strength_label" style="@style/info_label" />
+            <TextView android:id="@+id/dbm" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Voice Service Status -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_gsm_service_label" style="@style/info_label" />
+            <TextView android:id="@+id/gsm" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Data Service Status -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_gprs_service_label" style="@style/info_label" />
+            <TextView android:id="@+id/gprs" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Network Type -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_voice_network_type_label" style="@style/info_label" />
+            <TextView android:id="@+id/voice_network" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Network Type -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_data_network_type_label" style="@style/info_label" />
+            <TextView android:id="@+id/data_network" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Call Status -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_call_status_label" style="@style/info_label" />
+            <TextView android:id="@+id/call" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Roaming -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
+            <TextView android:id="@+id/roaming" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Preferred Network Type -->
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/radio_info_set_perferred_label"
+                style="@style/info_label"
+                />
+
+        <Spinner android:id="@+id/preferredNetworkType"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                />
+
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="#000000" />
+
         <!-- Ping stats -->
         <Button android:id="@+id/ping_test"
                 android:textSize="14sp"
@@ -65,41 +128,11 @@
             <TextView android:id="@+id/httpClientTest" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Signal Strength -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_signal_strength_label" style="@style/info_label" />
-            <TextView android:id="@+id/dbm" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- CellInfoListRate -->
-        <Button android:id="@+id/cell_info_list_rate"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-        <!-- Location -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_signal_location_label" style="@style/info_label" />
-            <TextView android:id="@+id/location" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Neighboring Cids -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_neighboring_location_label"
-                      style="@style/info_label" />
-            <TextView android:id="@+id/neighboring" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- CellInfo -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_cellinfo_label"
-                      style="@style/info_label" />
-        </LinearLayout>
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:id="@+id/cellinfo" style="@style/info_value" />
-        </LinearLayout>
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="#000000" />
 
         <!-- DcRtInfo - DataConnectionRealTimeInfo -->
         <LinearLayout style="@style/entry_layout">
@@ -108,30 +141,6 @@
             <TextView android:id="@+id/dcrtinfo" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Roaming -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
-            <TextView android:id="@+id/roaming" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- GSM Service -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_gsm_service_label" style="@style/info_label" />
-            <TextView android:id="@+id/gsm" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- GPRS Service -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_gprs_service_label" style="@style/info_label" />
-            <TextView android:id="@+id/gprs" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Network Type -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_network_type_label" style="@style/info_label" />
-            <TextView android:id="@+id/network" style="@style/info_value" />
-        </LinearLayout>
-
         <!-- Message Waiting Indicator -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_message_waiting_label" style="@style/info_label" />
@@ -144,39 +153,6 @@
             <TextView android:id="@+id/cfi" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Call Status -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_call_status_label" style="@style/info_label" />
-            <TextView android:id="@+id/call" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Radio Resets -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_radio_resets_label" style="@style/info_label" />
-            <TextView android:id="@+id/resets" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Attempted Data Connections -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_data_attempts_label"
-                style="@style/info_label" />
-            <TextView android:id="@+id/attempts" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Successful Data Connections -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_data_successes_label"
-                style="@style/info_label" />
-            <TextView android:id="@+id/successes" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- GSM Disconnects -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_gsm_disconnects_label"
-                style="@style/info_label" />
-            <TextView android:id="@+id/disconnects" style="@style/info_value" />
-        </LinearLayout>
-
         <!-- PPP Sent -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_ppp_sent_label"
@@ -198,58 +174,21 @@
             <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Preferred Network Type -->
-        <TextView
+        <!-- Radio Power -->
+        <Switch android:id="@+id/radio_power"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/radio_info_set_perferred_label"
-                style="@style/info_label"
-                />
-
-        <Spinner android:id="@+id/preferredNetworkType"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                />
-
-        <!-- Radio Power -->
-        <Button android:id="@+id/radio_power"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-       <!-- IMS registration required -->
-        <Button android:id="@+id/ims_reg_required"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
+                android:text="@string/radio_info_radio_power"/>
 
         <!-- VoLTE provisioned -->
-        <Button android:id="@+id/volte_provisioned_flag"
+        <Switch android:id="@+id/volte_provisioned_switch"
                 android:textSize="14sp"
                 android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                />
-
-        <!-- SMS over IMS -->
-        <Button android:id="@+id/sms_over_ims"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-        <!-- LTE ram dump -->
-        <Button android:id="@+id/lte_ram_dump"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
+                android:text="@string/volte_provisioned_switch_string"/>
 
         <!-- SMSC -->
         <RelativeLayout android:layout_width="match_parent"
@@ -303,5 +242,49 @@
                 android:text="@string/oem_radio_info_label"
                 />
 
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="#000000" />
+
+        <!-- CellInfoListRate Selection -->
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/radio_info_cell_info_refresh_rate"
+                style="@style/info_label"
+                />
+
+        <Spinner android:id="@+id/cell_info_rate_select"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                />
+
+        <!-- Location -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_signal_location_label" style="@style/info_label" />
+            <TextView android:id="@+id/location" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Neighboring Cids -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_neighboring_location_label"
+                      style="@style/info_label" />
+            <TextView android:id="@+id/neighboring" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- CellInfo -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_cellinfo_label"
+                      style="@style/info_label" />
+        </LinearLayout>
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:id="@+id/cellinfo"
+                      style="@style/info_value"
+                      android:minHeight="300dip"
+                      android:textSize="12sp" />
+        </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index 4280091..b7d2d15 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -17,7 +17,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true" >
+    android:fillViewport="true"
+    android:importantForAccessibility="noHideDescendants">
 
     <view class="com.android.settings.TouchBlockingFrameLayout"
         android:id="@+id/frame"
@@ -31,8 +32,7 @@
             android:paddingTop="@dimen/conversation_message_list_padding"
             android:paddingStart="@dimen/conversation_message_list_padding"
             android:paddingEnd="@dimen/conversation_message_list_padding"
-            android:orientation="vertical"
-            android:importantForAccessibility="noHideDescendants">
+            android:orientation="vertical">
 
             <com.android.settings.display.ConversationMessageView
                 android:layout_width="match_parent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3657942..a13cdaa 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Kies werkslot"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Beskerm jou foon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"\'n Vingerafdruk kan dalk minder veilig wees as \'n sterk patroon, PIN of wagwoord. Stel \'n rugsteunsluitskerm op om veilig te wees."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon, PIN of wagwoord wees. Stel \'n rugsteunskermslot op vir bykomende sekuriteit."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Keer ander mense om hierdie tablet sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiveer"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktiveer"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Verwyder"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Vertrou"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Aktiveer die stelsel se CA-sertifikaat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Deaktiveer die stelsel se CA-sertifikaat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Verwyder die gebruiker se CA-sertifikaat permanent?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Stel ShortcutManager se koersbeperkingtellers terug?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Beheer sluitskermkennisgewings"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Wys of versteek kennisgewinginhoud"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 958ed0e..1be18ee 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"የስራ ቁልፍ ይምረጡ"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ለእርስዎ ስልክ ጥበቃ ይድርጉ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት፣ ፒን ወይም የይለፍ ቃል ያነሰ ደኅንነቱ አስተማማኝ ነው። ደኅንነትዎ የተጠበቀ እንዲሆን ምትኬ የማያ ገጽ መቆለፊያ ያዘጋጁ።"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"የእርስዎ ጣት አሻራ ደኅንነት አስተማማኝነት ከጠንካራ ሥርዓተ ጥለት፣ ፒን ወይም የይለፍ ቃል ያነሰ ሊኖረው ይችላል። ለተጨማሪ ደኅንነት ምትኬ የማያ ገጽ መቆለፊያን ያዘጋጁ።"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ጡባዊ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"የመሣሪያ ጥበቃ ማድረጊያ ባሕሪዎችን በማግበር ያለ እርስዎ ፈቃድ ሌሎች ይህን መሣሪያ እንዳይጠቀሙ ይከላከሉዋቸው። መጠቀም የሚፈልጉትን ማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ስልክ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"የይለፍ ቃል ተዘጋጅቷል"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ፒን  አልተዘጋጀም ነበር"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ስርዓተ ጥለት ተዘጋጅቷል"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"ለመቀጠል የመሣሪያዎን ስርዓተ ጥለት ይጠቀሙ"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"ለመቀጠል የመሣሪያዎን ፒን ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"ለመቀጠል የመሣሪያዎን ይለፍ ቃል ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ለመቀጠል የሥራ ስርዓተ-ጥለትዎን ይጠቀሙ"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ለመቀጠል የሥራ ፒንዎን ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ለመቀጠል የሥራ ይለፍ ቃልዎን ያስገቡ"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"የተሳሳተ ፒን"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"የተሳሳተ ይለፍ ቃል"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"የተሳሳተ ስርዓተ ጥለት"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"አቦዝን"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"አንቃ"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"አስወግድ"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"እምነት"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"የስርዓቱን CA  ዕውቅና ማረጋገጫ አንቃ"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"የስርዓቱ CA  ዕውቅና ማረጋገጫ ይቦዝን?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"የተጠቃሚውን CA  ዕውቅና ማረጋገጫ በቋሚነት ይወገድ?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ንዘር"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ቅድሚያ ተሰጪ ብቻ ይፈቅዳል"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ራስ-ሰር ደንቦች"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"የአትረብሽ መርሐግብር ያዘጋጁ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"በተወሰኑ ጊዜያት ላይ የመሣሪያዎን ድምጽ ያጥፉት"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ቅድሚያ የሚሰጠው ብቻ"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ማንቂያዎች ብቻ"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"የShortcutManager ደረጃ-ገዳቢ ቆጣሪዎች ዳግም ይቀናበሩ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"የማያ ገጽ መቆለፊያ ማሳወቂያዎችን ይቆጣጠሩ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"የማሳወቂያ ይዘት አሳይ ወይም ደብቅ"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> ዲፒ"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"አነስተኛ ስፋት"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fbc4c9b..7ca92e8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -89,9 +89,9 @@
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"نموذج نص"</string>
-    <string name="font_size_preview_text_title" msgid="1310536233106975546">"مدينة أوز الزمردية العجيبة"</string>
+    <string name="font_size_preview_text_title" msgid="1310536233106975546">"ساحر أوز العجيب"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"الفصل ۱۱: مدينة أوز الزمردية العجيبة"</string>
-    <string name="font_size_preview_text_body" msgid="1250552239682375643">"على الرغم من أن عيون دورثي ورفاقها كانت محمية بنظارات خضراء، فقد أثار دهشتهم لأول وهلة تألق المدينة العجيبة. كانت المنازل الرائعة متراصة على الشوارع ومصمّمة جميعها برخام أخضر ومرصعة بالزمرد البرّاق. لقد ساروا على رصيف الرخام الأخضر حيث المباني الضخمة كانت تظهر صفوف الزمرد المتراصة عن قرب إلى جانب بريق الشمس الساطعة. كان لون ألواح النوافذ الزجاجية أخضر، وهكذا لون سماء المدينة الذي كانت تشوبه الخضرة، وكانت أشعة الشمس خضراء. \n\nكان الكثير من الرجال والنساء والأطفال يجوبون الشوارع ويرتدون جميعهم ملابس خضراء وبشرتهم تميل إلى الخضرة. نظروا إلى دورثي ورفقتها الغريبة بتعجّب، بينما فرّ جميع الأطفال هاربين واختبؤا وراء أمهاتهم عند ظهور الأسد، ولكن لم يتحدث معهم أحد. كانت هناك الكثير من المتاجر في الشارع، وقد نظرت دورثي إليها لتجد أن جميعها باللون الأخضر. كانت المتاجر تعرض حلوى خضراء وفيشار ذرة أخضر للبيع وكذلك أحذية وقبعات وملابس خضراء من كل نوع. وفي أحد الأركان، كان هناك رجل يبيع ليمونًا أخضرًا، وعندما اشتراه الأطفال كانت دورثي ترى العملة المدفوعة مقابل هذا الليمون لونها أخضر. \n\nبدا أنه ليست هناك أية أحصنة أو حيوانات من أي نوع، وكان الرجال يحملون أمتعتهم في عربات خضراء صغيرة يدفعونها أمامهم. كما كان الجميع يشعر بالسعادة والطمأنينة."</string>
+    <string name="font_size_preview_text_body" msgid="1250552239682375643">"على الرغم من احتماء دورثي ورفاقها خلف نظارات خضراء، انبهرت عيونهم للوهلة الأولى بتوهج المدينة العجيبة وتألقها. كانت المنازل الرائعة أمامهم متراصة على الشوارع ومصممة جميعها من الرخام الأخضر المرصع بالزمرّد البرّاق. ساروا على رصيف من الرخام الأخضر نفسه حيث تلتقي المباني الضخمة على صفوف من الزمرد المتلألئ تحت أشعة الشمس الساطعة. كانت ألواح النوافذ الزجاجية خضراء هي أيضًا، حتى أنّ السماء وأشعة الشمس تلوّنت بالأخضر الفاتح.  \n\nرأوا الكثير من الرجال والنساء والأطفال يجوبون الشوارع وجميعهم في ثياب خضراء فوق بشرة تميل إلى الأخضر. نظروا إلى دورثي ورفاقها الغريبين بتعجب، في حين أنّ الأطفال اختبأوا وراء أمهاتهم خائفين من الأسد، ولكن لم يتحدث معهم أحد. اصطفّت في الشارع المتاجر الخضراء ولاحظت دورثي أنّ كل ما فيها كان أخضر، من الحلوى الخضراء والفشار الأخضر إلى الأحذية والقبعات والملابس الخضراء. وفي أحد الأركان، وقف رجل يبيع الليموناضة الخضراء ورأت دورثي أنّ الأطفال كانوا يشترون العصير منه بعملة خضراء هي أيضًا. \n\nخلت الشوارع من الأحصنة أو أي نوع آخر من الحيوانات، وكان الرجال ينقلون أمتعتهم في عربات خضراء صغيرة يدفعونها أمامهم. وبدت ملامح السعادة والارتياح على وجوه الجميع."</string>
     <string name="font_size_save" msgid="3450855718056759095">"موافق"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"‏وحدة تخزين USB"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"‏بطاقة SD"</string>
@@ -300,7 +300,7 @@
     <string name="zone_auto" msgid="334783869352026648">"المنطقة الزمنية التلقائية"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"استخدام المنطقة الزمنية للشبكة"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"استخدام المنطقة الزمنية للشبكة"</string>
-    <string name="date_time_24hour_title" msgid="3203537578602803850">"تنسيق 24 ساعة"</string>
+    <string name="date_time_24hour_title" msgid="3203537578602803850">"تنسيق ٢٤ ساعة"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"استخدام تنسيق ٢٤ ساعة"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"المدة"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"تعيين الوقت"</string>
@@ -433,7 +433,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"اختيار قفل العمل"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"حماية هاتفك"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ربما تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي أو كلمة مرور قوية. يمكنك إعداد شاشة تأمين احتياطية لتأمين نفسك."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ربما تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي أو كلمة مرور قوية. للحصول على مزيد من الأمان، يمكنك إعداد قفل شاشة احتياطي."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"يمكنك منع الآخرين من استخدام هذا الجهاز اللوحي بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
@@ -516,7 +516,7 @@
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"‏يجب أن يكون رمز PIN أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأرقام."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"‏يجب ألا يحتوي رمز PIN سوى على أرقام من 0 إلى 9 فقط."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"يجب ألا يحتوي رقم التعريف الشخصي سوى على أرقام من ٠ إلى ٩ فقط."</string>
     <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي تم استخدامه مؤخرًا."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"تحتوي كلمة المرور على حرف غير مسموح به."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</string>
@@ -593,7 +593,7 @@
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"اكتب شفرة الإقران، ثم اضغط على \"رجوع\" أو \"إدخال\""</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"‏يشتمل رمز PIN على أحرف ورموز"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"0000 أو 1234 عادة"</string>
-    <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"يجب أن يتكون من 16 رقمًا"</string>
+    <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"يجب أن يتكون من ١٦ رقمًا"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"‏قد يلزم أيضًا كتابة رمز PIN هذا على الجهاز الآخر."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"قد يلزم أيضًا كتابة مفتاح المرور هذا على الجهاز الآخر."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"‏للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;تأكد من أنه يعرض مفتاح المرور هذا:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
@@ -662,7 +662,7 @@
     <string name="wifi_display_options_done" msgid="5703116500357822557">"تم"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"الاسم"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 غيغاهرتز"</string>
-    <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 غيغاهرتز"</string>
+    <string name="wifi_band_5ghz" msgid="6433822023268515117">"۵ غيغاهرتز"</string>
     <string name="link_speed" msgid="8896664974117585555">"‏%1$d ميغابت في الثانية"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
@@ -758,8 +758,8 @@
     <string name="wifi_password" msgid="5948219759936151048">"كلمة المرور"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"إظهار كلمة المرور"</string>
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"‏تحديد نطاق AP"</string>
-    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"نطاق بتردد 2.4 غيغاهرتز"</string>
-    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"نطاق بتردد 5 غيغاهرتز"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"نطاق بتردد ٢.٤ غيغاهرتز"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"نطاق بتردد ۵ غيغاهرتز"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"‏إعدادات IP"</string>
     <string name="wifi_shared" msgid="844142443226926070">"المشاركة مع مستخدمي الجهاز الآخرين"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(لم يتم التغيير)"</string>
@@ -1676,7 +1676,7 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"الشاشة"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"التسميات التوضيحية"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"إيماءة التكبير"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر 3 مرات للتكبير."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر ۳ مرات للتكبير."</string>
     <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"للتكبير"</b>"، انقر على الشاشة بسرعة 3 مرات بإصبع واحد.\n"<ul><li>"اسحب إصبعين أو أكثر للتمرير"</li>\n<li>"قارب بين إصبعين أو أكثر معًا أو باعد بينهما لضبط مستوى التكبير / التصغير"</li></ul>\n\n<b>"للتكبير بشكل مؤقت"</b>"، انقر بسرعة على الشاشة 3 مرات واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب إصبعك للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"اختصارات تسهيل الدخول"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"تشغيل"</string>
@@ -1947,9 +1947,9 @@
     <string name="mem_use_zram_type" msgid="9087217476795358232">"‏تبديل ZRam"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"مجانًا"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"الإجمالي"</string>
-    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ساعات"</string>
-    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ساعات"</string>
-    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ساعة"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"۳ ساعات"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"٦ ساعات"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"۱۲ ساعة"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"يوم واحد"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"إظهار النظام"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"إخفاء النظام"</string>
@@ -2294,6 +2294,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"تعطيل"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"تمكين"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"إزالة"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"موثوق به"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"‏هل تريد تمكين شهادة CA للنظام؟"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"‏هل تريد تعطيل شهادة CA للنظام؟"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"‏هل تريد إزالة شهادة CA للمستخدم بشكل دائم؟"</string>
@@ -2547,7 +2548,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏علامة NFC ليست قابلة للكتابة. الرجاء استخدام علامة مختلفة."</string>
     <string name="default_sound" msgid="8821684447333687810">"الصوت الافتراضي"</string>
     <string name="sound_settings_summary" msgid="3651751880569558828">"مستوى صوت الرنين على <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_settings_example_summary" msgid="6810096712869633479">"مستوى صوت الرنين 80%"</string>
+    <string name="sound_settings_example_summary" msgid="6810096712869633479">"مستوى صوت الرنين ۸۰٪"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"مستوى صوت الوسائط"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"مستوى صوت المنبّه"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"مستوى صوت الرنين"</string>
@@ -2932,7 +2933,7 @@
     <string name="memory_usage" msgid="1781358557214390033">"استخدام الذاكرة"</string>
     <string name="app_list_memory_use" msgid="6987417883876419338">"استخدام التطبيق"</string>
     <string name="memory_details" msgid="5943436005716991782">"التفاصيل"</string>
-    <string name="memory_use_summary" msgid="5608257211903075754">"متوسط الذاكرة المستخدمة خلال آخر 3 ساعات: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"متوسط الذاكرة المستخدمة خلال آخر ۳ ساعات: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"لم يتم استخدام الذاكرة خلال آخر ۳ ساعات"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"الترتيب بحسب متوسط الاستخدام"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"الترتيب بحسب الاستخدام الأقصى"</string>
@@ -3007,10 +3008,10 @@
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"مرحبًا، ما رأيك في الخروج لتناول القهوة معًا اليوم؟"</string>
     <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"رائع. أعرف مكانًا جيدًا بالجوار."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"ممتاز."</string>
-    <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"الثلاثاء 6:00 م"</string>
-    <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"الثلاثاء 6:01 م"</string>
-    <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"الثلاثاء 6:02 م"</string>
-    <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"الثلاثاء 6:03 م"</string>
+    <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"الثلاثاء ٦:٠٠ م"</string>
+    <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"الثلاثاء ٦:٠١ م"</string>
+    <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"الثلاثاء ٦:٠٢ م"</string>
+    <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"الثلاثاء ٦:٠٣ م"</string>
     <string name="see_all" msgid="8883901630052886984">"عرض الكل"</string>
     <string name="see_less" msgid="1250265310929558370">"عرض عناصر أقل"</string>
     <string name="disconnected" msgid="5787956818111197212">"تم قطع الاتصال"</string>
@@ -3025,7 +3026,7 @@
     </plurals>
     <string name="notification_summary_none" msgid="3440195312233351409">"يُسمح لجميع التطبيقات بالإرسال"</string>
     <string name="apps_summary" msgid="193158055537070092">"تم تثبيت <xliff:g id="COUNT">%1$d</xliff:g> تطبيق"</string>
-    <string name="apps_summary_example" msgid="2118896966712746139">"24 تطبيقًا مثبَّتًا"</string>
+    <string name="apps_summary_example" msgid="2118896966712746139">"٢٤ تطبيقًا مثبَّتًا"</string>
     <string name="storage_summary" msgid="1110250618334248745">"تم استخدام <xliff:g id="SIZE1">%1$s</xliff:g> من <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
     <string name="display_summary_on" msgid="5628868543070268634">"تم تشغيل السطوع التكيفي"</string>
     <string name="display_summary_off" msgid="6399558022426312990">"تم إيقاف السطوع التكيفي"</string>
@@ -3150,4 +3151,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏هل تريد إعادة تعيين عدادات تقييد المعدل في ShortcutManager؟"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"التحكم في إشعارات شاشة التأمين"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"إظهار محتوى الإشعار أو إخفاؤه"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"أصغر عرض"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 3e2c301..6b8a42f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidi seçin"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"İş kilidi seçin"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefonunuzu qoruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Barmaq izi güclü nümunə kod və ya PIN koddan daha az təhlükəsizdir. Əmin olmaq üçün ekran kilidi yedəkləməsi quraşdırın."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Barmaq izi güclü nümunə kod və ya PIN koddan daha az təhlükəsizdir. Əlavə edilmiş təhlükəsizlik üçün, arxa fon ekran kilidini quraşdırın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parol ayarlandı"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ayarlandı"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Model müəyyən edildi"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Davam etmək üçün cihaz modelinizi istifadə edin"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Davam etmək üçün cihaz PİN kodunu daxil edin"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Davam etmək üçün cihaz parolunu daxil edin"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Davam etmək üçün iş modelinizi istifadə edin"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Davam etmək üçün iş PİN kodunu daxil edin"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Davam etmək üçün iş parolunu daxil edin"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN səhvdir"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış parol"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış model"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiv et"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktiv et"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Sil"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Güvən"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Sistem CA sertifikatı aktiv edilsin?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Sistem CA sertifikatı deaktiv edilsin?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"İstifadəçi CA sertifikatı həmişəlik silinsin?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titrət"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnız prioritet icazə verir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qaydalar"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Narahat etməyin Cədvəlini quraşdırın"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Cihazınızı müəyyən vaxtlarda səssiz edin"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Yalnız prioritet"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnız alarmlar"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager reytinq limit hesablayıcı sıfırlansın?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran kilidi bildirişlərinə nəzarət edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildiriş məzmununu göstərin və ya gizlədin"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Ən kiçik en"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 198ed00..34026e0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -424,7 +424,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje ekrana"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Izaberite zaključavanje za Work"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a ili lozinke. Podesite rezervni metod za zaključavanje ekrana da biste bili bezbedni."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak prsta može da bude manje bezbedan od jakog šablona, PIN-a ili lozinke. Podesite rezervni metod za zaključavanje ekrana radi dodatne bezbednosti."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Sprečite druge da koriste ovaj tablet bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Sprečite druge da koriste ovaj telefon bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
@@ -1319,18 +1319,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lozinka je postavljena"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN je postavljen"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Šablon je postavljen"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Upotrebite šablon za uređaj da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Unesite PIN uređaja da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Unesite lozinku uređaja da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Upotrebite šablon za profil za Work da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Unesite PIN za profil za Work da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Unesite lozinku za profil za Work da biste nastavili"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan šablon"</string>
@@ -2249,6 +2243,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogući"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Omogući"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ukloni"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Imaj poverenja"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Želite li da omogućite sistemski CA sertifikat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Želite li da onemogućite sistemski CA sertifikat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Želite da trajno uklonite CA sertifikat korisnika?"</string>
@@ -2526,8 +2521,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesite raspored za Ne uznemiravaj"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Isključite ponekad zvuk na uređaju"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
@@ -3073,4 +3067,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Želite li da resetujete brojanje za ograničavanje broja u ShortcutManager-u?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolišite obaveštenja na zaklj. ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pregledajte ili sakrijte sadržaj obaveštenja"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index 0a4cfe0..8e72a33 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Выб. блак. прац. проф."</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Абараніце свой тэлефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Выкарыстанне адбітка пальца можа быць менш надзейным, чым складаны ўзор або PIN-код. Для большай надзейнасці наладзьце альтэрнатыўны спосаб блакіроўкі экрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Выкарыстанне адбітка пальца можа быць менш надзейным, чым складаны графічны ключ, PIN-код або пароль. Для большай бяспекі наладзьце альтэрнатыўны спосаб блакіроўкі экрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Прадухіліце выкарыстанне гэтага планшэта без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Прадухіліце выкарыстанне гэтай прылады без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Прадухіліце выкарыстанне гэтага тэлефона без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
@@ -1321,18 +1321,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль усталяваны"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код усталяваны"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Шаблон усталяваны"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Каб працягнуць, выкарыстайце ўзор прылады"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Каб працягнуць, увядзіце PIN-код прылады"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Каб працягнуць, увядзіце пароль прылады"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Каб працягнуць, выкарыстайце ўзор свайго працоўнага профілю"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Каб працягнуць, увядзіце PIN-код свайго працоўнага профілю."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Каб працягнуць, увядзіце пароль свайго працоўнага профілю"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Няправільны PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Няправiльны пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Няправільны графічны ключ"</string>
@@ -2258,6 +2252,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Выключыць"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Уключыць"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Выдаліць"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Давяраць"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Уключыць CA-сертыфікат сістэмы?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Адключыць CA-сертыфікат сістэмы?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Канчаткова выдаліць сертыфікат карыстальніка CA?"</string>
@@ -2535,8 +2530,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібрацыя"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дазволены толькі прыярытэтныя"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аўтаматычныя правілы"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Задаць графік рэж. \"Не турб.\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Бясшумны рэжым у пэўныя часы"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Толькі прыярытэтныя"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Толькі будзільнікі"</string>
@@ -3094,4 +3088,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Скінуць лічыльнікі абмежавання частаты ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Кіраванне апавяшчэннямі экрана блакір."</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Паказваць ці хаваць змесціва апавяшчэнняў"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> пікселяў, не залежных ад шчыльнасці"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Найменшая шырыня"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0e54393..96e3179 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Служ. опция за заключ.: Избор"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Защитете телефона си"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Отпечатъкът може да е по-малко сигурен в сравнение с надеждна фигура, ПИН код или парола. Настройте резервна опция за заключен екран, за да сте защитени."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Отпечатъкът може да е по-малко сигурен в сравнение с надеждна фигура, ПИН код или парола. За допълнителна сигурност настройте резервна опция за заключване на екрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Предотвратете използването на този таблет от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Предотвратете използването на това устройство от други хора без разрешението ви, като активирате функциите за защитата му. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Предотвратете използването на този телефон от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Деактивиране"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Активиране"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Премахване"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Доверяване"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Да се активира ли сертификатът от сертифициращ орган за системата?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Да се деактивира ли сертификатът от сертифициращ орган за системата?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Да се премахне ли завинаги сертификатът от сертифициращ орган за потребителя?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Да се нулират ли броячите за ограничаване на скоростта в ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Известия на заключения екран: Управление"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показване или скриване на съдържанието на известията"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Най-малката ширина"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 94dc38d..f49fb3b 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"স্ক্রীন লক চয়ন করুন"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"কর্মস্থলের লক চয়ন করুন"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"আপনার ফোন রক্ষা করুন"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"আঙ্গুলের ছাপ একটি শক্তিশালী প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে। নিরাপদ রাখতে একটি ব্যাক আপ লক স্ক্রীন সেট আপ করুন৷"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"আপনার আঙ্গুলের ছাপ একটি শক্তিশালী প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে। অতিরিক্ত নিরাপত্তা যোগ করার জন্য একটি ব্যাক আপ স্ক্রীন লক সেট আপ করুন৷"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ট্যাবলেটটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক চয়ন করুন৷"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ডিভাইসটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক চয়ন করুন৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ফোনটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক চয়ন করুন৷"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"অক্ষম করুন"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"সক্ষম করুন"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"সরান"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"বিশ্বাস"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"সিস্টেমের CA শংসাপত্র সক্ষম করবেন?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"সিস্টেমের CA শংসাপত্র অক্ষম করবেন?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"স্থায়ীভাবে ব্যবহারকারী CA শংসাপত্র সরাবেন?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager রেট-লিমিটিং কাউন্টারগুলিকে পুনঃসেট করবেন?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"লক স্ক্রীন বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির সামগ্রী দেখান বা লুকান"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"সবচেয়ে কম প্রস্থ"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 9e6ff74..3ab95eb 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -424,7 +424,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberi zaklj. ekrana"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Odaberi zaklj. profila"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisak prsta može biti manje siguran nego jak uzorak ili PIN kôd. Da biste bili sigurni, postavite pomoćno zaključavanje ekrana."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak vašeg prsta može biti manje siguran nego jak uzorak, PIN kôd ili lozinka. Za dodatnu sigurnost, postavite pomoćno zaključavanje 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>
@@ -1311,18 +1311,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lozinka je postavljena"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN je postavljen"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Uzorak je postavljen"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Za nastavak, koristite uzorak uređaja."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Za nastavak, unesite PIN uređaja."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Za nastavak, unesite lozinku uređaja."</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Za nastavak, unesite radni uzorak"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Za nastavak, unesite radni PIN."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Za nastavak, unesite radnu lozinku."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan uzorak"</string>
@@ -2241,6 +2235,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogući"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Omogući"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ukloni"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Povjerenje"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Omogućiti sistemski CA certifikat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Onemogućiti sistemski CA certifikat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Trajno ukloniti korisnički CA certifikat?"</string>
@@ -2518,8 +2513,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dopustiti samo prioritete"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesi funkciju Ne uznemiravajj"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Utišajte uređaj u dato vrijeme"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
@@ -3066,4 +3060,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Želite li poništiti brojače koji ograničavaju mjeru ShortcutManagera"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavještenja zaključanog ekrana"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaži ili sakrij sadržaj obavještenja"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b8d1861..ba7a5fb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria un bloqueig de pantalla"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Tria bloq. profess."</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protegeix el telèfon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fer servir l\'empremta digital pot ser menys segur que utilitzar un patró, un PIN o una contrasenya segurs. Configura una pantalla de bloqueig per estar protegit."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fer servir l\'empremta digital pot ser menys segur que utilitzar un patró, un PIN o una contrasenya segurs. Configura un bloqueig de pantalla de seguretat per tenir un nivell addicional de seguretat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contrasenya s\'ha definit"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"S\'ha definit el PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patró s\'ha definit"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Utilitza el patró del dispositiu per continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Introdueix el PIN del dispositiu per continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Introdueix la contrasenya del dispositiu per continuar"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utilitza el patró de la feina per continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introdueix el PIN de la feina per continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introdueix la contrasenya de la feina per continuar"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecte"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasenya incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patró incorrecte"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desactiva"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activa"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Elimina"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confia-hi"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vols activar el certificat de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vols desactivar el certificat de CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols suprimir el certificat de CA d\'usuari de manera permanent?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibració"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Només amb prioritat"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Configura horari de No molesteu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silencia en hores concretes"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Només amb prioritat"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Només alarmes"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vols restablir els comptadors de limitació de velocitat de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controla notificacions de pantalla bloq."</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o oculta el contingut de la notificació"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Amplada més petita"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6acd752..b71eeaa 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zámek obrazovky"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Zvolte pracovní zámek"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Chraňte svůj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisk prstu není tak bezpečný než silné gesto, kód PIN nebo heslo. Chcete-li být lépe zabezpečeni, nastavte záložní zámek obrazovky."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisk prstu není tak bezpečný jako silné gesto, kód PIN nebo heslo. Za účelem zvýšení zabezpečení nastavte záložní zámek obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bylo nastaveno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kód PIN byl nastaven"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Gesto bylo nastaveno"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Chcete-li pokračovat, zadejte gesto zařízení."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Chcete-li pokračovat, zadejte PIN zařízení."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Chcete-li pokračovat, zadejte heslo zařízení."</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Chcete-li pokračovat, zadejte pracovní gesto."</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Chcete-li pokračovat, zadejte pracovní PIN."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Chcete-li pokračovat, zadejte pracovní heslo."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávný kód PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávné heslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávné gesto"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zakázat"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Povolit"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odstranit"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Důvěřovat"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Povolit certifikát CA systému?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Zakázat certifikát CA systému?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Natrvalo odstranit uživatelský certifikát CA?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrace"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pouze prioritní"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatická pravidla"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nastavit plán režimu Nerušit"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Zařízení se někdy ztiší"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Pouze prioritní"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Pouze budíky"</string>
@@ -3101,4 +3095,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Resetovat počítadla limitů četnosti služby ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Správa oznámení na obrazovce uzamčení"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazit nebo skrýt obsah oznámení"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Minimální šířka"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4c143cd..bceb9f1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Vælg arbejdslås"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Beskyt din telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode eller adgangskode. Konfigurer en ekstra låseskærm for at være sikker."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode eller adgangskode. Konfigurer en ekstra låseskærm for at være sikker."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Adgangskoden er indstillet"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Pinkoden er blevet indstillet"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønsteret er blevet indstillet"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Brug mønsteret til din enhed for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Indtast pinkoden til din enhed for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Indtast adgangskoden til din enhed for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Brug mønsteret til din arbejdsprofil for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Indtast pinkoden til din arbejdsprofil for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Indtast adgangskoden til din arbejdsprofil for at fortsætte"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Forkert pinkode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Forkert adgangskode"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Forkert mønster"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiver"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktivér"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Fjern"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Tillid"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vil du aktivere systemets CA-certifikat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vil du deaktivere systemets CA-certifikat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vil du fjerne bruger-CA-certifikatet?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillader kun"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Konfigurer Forstyr ikke-plan"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Gør enheden lydløs på bestemte tidspunkter"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kun prioritet"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kun alarmer"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vil du nulstille tællere til antalsbegrænsning i ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér underretninger for låseskærm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul indhold i underretninger"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Mindste bredde"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 577dcce..47f87d6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -420,7 +420,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Displaysperre wählen"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Geschäftliche Sperre"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Smartphone schützen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Ein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster, eine PIN oder ein Passwort. Richte einen Sicherungssperrbildschirm ein, um die Sicherheit zu erhöhen."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster, eine PIN oder ein Passwort. Richte einen Sicherungssperrbildschirm ein, um die Sicherheit zu erhöhen."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Das Passwort wurde festgelegt."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Die PIN wurde festgelegt."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Das Muster wurde festgelegt."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Gib zum Fortfahren das Muster für dein Gerät ein"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Gib zum Fortfahren die PIN für dein Gerät ein"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Gib zum Fortfahren das Passwort für dein Gerät ein"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gib zum Fortfahren das Muster deines Arbeitsprofils ein"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Gib zum Fortfahren die PIN deines Arbeitsprofils ein"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Gib zum Fortfahren das Passwort deines Arbeitsprofils ein"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Falsche PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Falsches Passwort"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Falsches Muster"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktivieren"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktivieren"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Entfernen"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Vertrauen"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"System-CA-Zertifikat aktivieren?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"System-CA-Zertifikat deaktivieren?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"CA-Zertifikat des Nutzers endgültig entfernen?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbr. zulassen"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\"Nicht stören\" einrichten"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Gerät zu best. Zeiten stummschalten"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Nur wichtige Unterbrechungen"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Nur Wecker"</string>
@@ -3047,4 +3041,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Zähler für Zugriffsbegrenzungen im ShortcutManager zurücksetzen?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Sperrbildschirm-Benachr. verwalten"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Benachrichtigungsinhalt ein- oder ausblenden"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Geringste Breite"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b35460e..40c7a3f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθ."</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Επιλ. κλειδ. εργασίας"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Προστασία τηλεφώνου"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Το δακτυλικό αποτύπωμα ενδέχεται να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο, κάποιο PIN ή έναν κωδικό πρόσβασης. Ρυθμίστε ένα εφεδρικό κλείδωμα οθόνης για να είστε ασφαλείς."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Το δακτυλικό σας αποτύπωμα ενδέχεται να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο, κάποιο PIN ή έναν κωδικό πρόσβασης. Για επιπλέον ασφάλεια, ορίστε ένα εφεδρικό κλείδωμα οθόνης."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Αποτρέψτε άλλους από τη χρήση αυτής της συσκευής χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Αποτρέψτε άλλους από τη χρήση αυτού του τηλεφώνου χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Απενεργοποίηση"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ενεργοποίηση"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Κατάργηση"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Εμπιστοσύνη"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ενεργοποίηση πιστοποιητικού CA συστήματος;"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Απενεργοποίηση πιστοποιητικού CA συστήματος;"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Να καταργηθεί οριστικά το πιστοποιητικό CA χρήστη;"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Επαναφορά μετρητών ορίου ρυθμού ShortcutManager;"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Έλεγχος ειδοποιήσεων κλειδώματος οθόνης"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Εμφάνιση ή απόκρυψη περιεχομένου ειδοποιήσεων"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Μικρότερο πλάτος"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 9d9061c..6c522b2 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingerprint may be less secure than a strong pattern, PIN or password. Set up a backup lock screen to be secure."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Your fingerprint may be less secure than a strong pattern, PIN or password. For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Use your device pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Enter your device PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Enter your device password to continue"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disable"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remove"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Trust"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Enable the system CA certificate?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disable the system CA certificate?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanently remove the user CA certificate?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Set Do Not Disturb schedule"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silence your device at certain times"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager rate-limiting counters?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9d9061c..6c522b2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingerprint may be less secure than a strong pattern, PIN or password. Set up a backup lock screen to be secure."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Your fingerprint may be less secure than a strong pattern, PIN or password. For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Use your device pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Enter your device PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Enter your device password to continue"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disable"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remove"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Trust"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Enable the system CA certificate?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disable the system CA certificate?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanently remove the user CA certificate?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Set Do Not Disturb schedule"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silence your device at certain times"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager rate-limiting counters?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 9d9061c..6c522b2 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingerprint may be less secure than a strong pattern, PIN or password. Set up a backup lock screen to be secure."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Your fingerprint may be less secure than a strong pattern, PIN or password. For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Use your device pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Enter your device PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Enter your device password to continue"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disable"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remove"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Trust"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Enable the system CA certificate?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disable the system CA certificate?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanently remove the user CA certificate?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Set Do Not Disturb schedule"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silence your device at certain times"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager rate-limiting counters?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index db5e61e..9d6af99 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -243,7 +243,7 @@
       <item quantity="other">¿Quitar los idiomas seleccionados?</item>
       <item quantity="one">¿Quitar el idioma seleccionado?</item>
     </plurals>
-    <string name="dlg_remove_locales_message" msgid="1361354927342876114">"El texto se mostrará en otro idioma"</string>
+    <string name="dlg_remove_locales_message" msgid="1361354927342876114">"El texto se mostrará en otro idioma."</string>
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"No se pueden quitar todos los idiomas"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Debes tener al menos un idioma preferido"</string>
     <string name="locale_not_translated" msgid="516862628177166755">"Es posible que no esté disponible en algunas apps"</string>
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Bloqueo de pantalla"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Elegir bloqueo"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protege el teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"La huella digital es menos segura que un patrón, un PIN o una contraseña. Configura una pantalla bloqueada para mayor seguridad."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Tu huella digital puede ser menos segura que un patrón, un PIN o una contraseña. Configura un bloqueo de pantalla para mayor seguridad."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Se ha configurado la contraseña."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Se ha configurado el PIN."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Se ha configurado el patrón."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Para continuar, usa el patrón del dispositivo"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Para continuar, ingresa el PIN del dispositivo"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Para continuar, ingresa la contraseña del dispositivo"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Para continuar, usa el patrón de tu perfil de trabajo"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Para continuar, ingresa el PIN de tu perfil de trabajo"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Para continuar, ingresa la contraseña de tu perfil de trabajo"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inhabilitar"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activar"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminar"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confiar"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"¿Deseas activar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Deseas desactivar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"¿Deseas eliminar de forma permanente el certificado de CA del usuario?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas de automatización"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Programar modo No molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silenciar en ciertos momentos"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioridad"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
@@ -3043,4 +3037,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"¿Quieres restablecer los contadores de limitación de frecuencia de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. en pantalla bloqueada"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ocultar o mostrar el contenido de las notificaciones"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5db91de..4247748 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elige un bloqueo"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Bloqueo de trabajo"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protege tu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Es posible que la huella digital sea menos segura que un buen patrón, PIN o contraseña. Configura una pantalla de bloqueo de la copia de seguridad para mayor protección."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Es posible que la huella digital sea menos segura que un buen patrón, PIN o contraseña. Configura un bloqueo de pantalla alternativo para mayor protección."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contraseña se ha establecido."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"El PIN se ha establecido."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patrón se ha establecido."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Utiliza el patrón del dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Introduce el PIN del dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Introduce la contraseña del dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utiliza tu patrón del trabajo para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introduce tu PIN del trabajo para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introduce tu contraseña del trabajo para continuar"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inhabilitar"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Habilitar"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminar"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confiar"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"¿Quieres habilitar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Quieres inhabilitar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"¿Quieres eliminar el certificado de CA de usuario de forma permanente?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo con prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Programar No molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silenciar en ocasiones"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioritarias"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"¿Restablecer contadores de límite de frecuencia de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificac. en pantalla bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar u ocultar contenido de las notificaciones"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index b1d4c0b..2b28f55 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Vali tööprofiili lukk"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefoni kaitsmine"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Sõrmejälg võib olla vähem turvaline kui tugev muster, PIN-kood või parool. Turvalisuse tagamiseks seadistage varulukustuskuva."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Teie sõrmejälg võib olla vähem turvaline kui tugev muster, PIN-kood või parool. Lisaturvalisuse jaoks seadistage varuekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Keela"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Luba"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eemalda"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Usalda"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Kas lubada süsteemi CA-sertifikaat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Kas keelata süsteemi CA-sertifikaat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Kas eemaldada kasutaja CA-sertifikaat jäädavalt?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Kas lähtestada teenuses ShortcutManager sageduse piiramise loendurid?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lukustuskuva märguannete juhtimine"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Märguande sisu kuvamine või peitmine"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Kõige väiksem laius"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4b9fb47..ae5dc38 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Aukeratu pantailaren blokeoa"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Aukeratu laneko blokeoa"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Babestu telefonoa"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Hatz-marka ez da eredu, PIN edo pasahitz zail bat bezain segurua. Seguruago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Hatz-marka ez da eredu, PIN edo pasahitz zail bat bezain segurua. Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Pasahitza ezarri da."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PINa ezarri da"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Eredua ezarri da."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Aurrera egiteko, marraztu gailuaren eredua"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Aurrera egiteko, idatzi gailuaren PIN kodea"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Aurrera egiteko, idatzi gailuaren pasahitza"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Aurrera egiteko, marraztu laneko eredua"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Aurrera egiteko, idatzi laneko PIN kodea"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Aurrera egiteko, idatzi laneko pasahitza"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN kodea ez da zuzena"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pasahitza ez da zuzena"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Eredua ez da zuzena"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desgaitu"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Gaitu"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Kendu"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Fidagarria da"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Sistemaren CA ziurtagiria gaitu?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Sistemaren CA ziurtagiria desgaitu?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Erabiltzailearen CA ziurtagiria betiko kendu?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Lehentasunezkoak soilik"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Zehaztu Ez molestatu ordutegia"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Desaktibatu audioa ordu batzuetan"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Lehentasunezkoak"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmak soilik"</string>
@@ -2826,7 +2820,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferitu argazkiak edo fitxategiak MTP onartzen ez bada (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Gailua MIDI gisa erabiltzeko"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Erabili gailua MIDI gisa"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Erabili USB konexioa hau egiteko"</string>
+    <string name="usb_use" msgid="3256040963685055320">"USB konexioaren erabilerak"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Atzeko planoko egiaztapena"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Atzeko planorako sarbide osoa"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Erabili pantailako testua"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Lasterbideak kudeatzeko ShortcutManager zerbitzuaren muga-kontagailuak berrezarri nahi dituzu?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Pantaila blokeatuko jakinarazpenak"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Erakutsi edo ezkutatu jakinarazpenaren edukia"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Zabalerarik txikiena"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index fd2cc5c..0e705d6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"انتخاب قفل صفحه‌نمایش"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"انتخاب قفل کاری"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"از تلفنتان محافظت کنید"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"اثر انگشت ممکن است نسبت به الگو، پین یا گذرواژه‌ای قوی ایمنی کمتری داشته باشد. برای اینکه ایمنی را حفظ کنید قفل صفحه پشتیبانی تنظیم کنید."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ممکن است اثر انگشت نسبت به الگو، پین یا گذرواژه‌ای قوی ایمنی کمتری داشته باشد. برای ایمنی بیشتر، یک قفل صفحه پشتیبان تنظیم کنید."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این رایانه لوحی استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"گذرواژه تنظیم شد"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"پین تنظیم شد"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"الگو تنظیم شد"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"برای ادامه، از الگوی دستگاهتان استفاده کنید"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"برای ادامه، کد پین دستگاهتان را وارد کنید"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"برای ادامه گذرواژه دستگاهتان را وارد کنید"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"برای ادامه، الگوی کاری‌تان را وارد کنید"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"برای ادامه، پین کاری‌تان را وارد کنید"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"برای ادامه، گذرواژه کاری‌تان را وارد کنید"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"پین اشتباه"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"گذرواژه اشتباه"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"الگوی اشتباه"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"غیرفعال کردن"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"فعال کردن"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"حذف کردن"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"اعتماد"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"‏گواهی CA سیستم فعال شود؟"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"‏گواهی CA سیستم غیرفعال شود؟"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"‏گواهی CA کاربر به صورت دائمی حذف شود؟"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"لرزش"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"فقط اولویت‌دار مجاز است"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"قوانین خودکار"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"تنظیم زمان‌بندی «مزاحم نشوید»"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"در زمان‌های خاصی دستگاه را بی‌صدا کنید"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"فقط اولویت‌دار"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"فقط هشدارها"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏شمارنده محدودکننده سرعت ShortcutManager بازنشانی شود؟"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"کنترل اعلان‌های صفحه در حالت قفل"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"نمایش یا پنهان کردن محتوای اعلان"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"‏dp ‏<xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"کوچک‌ترین عرض"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0136104..d6cedc0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse näytön lukitus"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Työprofiilin lukitus"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Suojaa puhelintasi"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio, PIN-koodi tai salasana. Määritä varalukitusmenetelmä suojauksen takaamiseksi."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio, PIN-koodi tai salasana. Paranna suojausta lisäämällä näytön varalukitustapa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Salasana on asetettu"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koodi asetettu"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kuvio on asetettu"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Jatka piirtämällä laitteesi kuvio."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Jatka antamalla laitteesi PIN-koodi."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Jatka antamalla laitteesi salasana."</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Jatka piirtämällä työprofiilisi kuvio."</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Jatka antamalla työprofiilisi PIN-koodi."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Jatka antamalla työprofiilisi salasana."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Väärä PIN-koodi"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Väärä salasana"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Väärä kuvio"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Poista käytöstä"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ota käyttöön"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Poista"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Luota"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Otetaanko järjestelmän CA-varmenne käyttöön?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Poistetaanko järjestelmän CA-varmenne käytöstä?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Poistetaanko käyttäjän CA-varmenne pysyvästi?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Värinä"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Sallittavat tärkeät ilmoitukset"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaattiset säännöt"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Aseta Älä häiritse ‑ajat"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Äänetön tila automaattisesti"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Vain tärkeät"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vain herätykset"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Nollataanko ShortcutManagerin kutsurajoituslaskurit?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Hallinnoi lukitusnäytön ilmoituksia"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Näytä tai piilota ilmoituksien sisältö."</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Pienin leveys"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8d44c44..a8b175c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Verrouill. profil pro"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Vos empreintes digitales peuvent être moins sécuritaires qu\'un schéma ou un NIP fiable. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Vos empreintes digitales peuvent être moins sécuritaires qu\'un motif ou un NIP fiable. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le NIP a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Entrez le motif de l\'appareil pour continuer"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Entrez le NIP de l\'appareil pour continuer"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Entrez le mot de passe de l\'appareil pour continuer"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Entrez le motif de votre profil professionnel pour continuer"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Entrez le NIP de votre profil professionnel pour continuer"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Entrez le mot de passe de votre profil professionnel pour continuer"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"NIP erroné"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma erroné"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Désactiver"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"activer"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Supprimer"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Faire confiance"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activer le certificat d\'autorité du système?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Désactiver le certificat d\'autorité du système?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Supprimer définitivement le certificat d\'autorité utilisateur?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priorités seulement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Définir horaires Ne pas déranger"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silencieux à certains moments"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priorités seulement"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Réinitialiser les compteurs de limitation de fréquence ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Gérer notifications écran verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8790e27..1d86313 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Verrouillage de l\'écran"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Verrouill. profil pro"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma, un code d\'accès ou un mot de passe fiables. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma, un code d\'accès ou un mot de passe fiables. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le code PIN a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Utilisez le schéma de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Saisissez le code de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Saisissez le mot de passe de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utilisez le schéma du profil professionnel pour continuer."</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Saisissez le code du profil professionnel pour continuer."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Saisissez le mot de passe du profil professionnel pour continuer."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Code d\'accès incorrect."</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect."</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma incorrect."</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Désactiver"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activer"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Supprimer"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Faire confiance"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activer le certificat d\'autorité du système ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Désactiver le certificat d\'autorité du système ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Supprimer définitivement le certificat d\'autorité utilisateur ?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires uniquement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Définir horaires Ne pas déranger"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silencieux à certains moments"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Interruptions prioritaires uniquement"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Réinitialiser les compteurs de limitation de fréquence ShortcutManager ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Contrôler notifications écran verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 3760f4c..1002ca5 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Bloqueo pantalla"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Bloqueo do traballo"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protexe o teu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"É posible que a túa impresión dixital sexa menos segura que un padrón ou PIN fiables. Configura unha pantalla de bloqueo en segundo plano para que sexa segura."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"É posible que a túa impresión dixital sexa menos segura que un padrón, PIN ou contrasinal fiables. Configura un bloqueo da pantalla alternativo para conseguir seguranza adicional."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa as funcións de protección do tablet para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Estableceuse o contrasinal"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Definiuse o PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Definiuse o padrón"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Utiliza o padrón do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Introduce o PIN do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Introduce o contrasinal do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utiliza o padrón do traballo para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introduce o PIN do traballo para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introduce o contrasinal do traballo para continuar"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasinal incorrecto"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrón incorrecto"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desactivar"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activar"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminar"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Fiable"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Queres activar o certificado de CA do sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Queres desactivar o certificado da autoridade de certificación do sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Queres eliminar o certificado de CA do usuario permanentemente?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Só permite prioridade"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Define o modo Non molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silencia o dispositivo a veces"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Só prioridade"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Só alarmas"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Queres restablecer os contadores de límite de velocidade de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificacións pantalla bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o contido das notificacións"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index fd3368e..e380d0c 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"સ્ક્રીન લૉક પસંદ કરો"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"કાર્ય લૉક પસંદ કરો"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ફોનની સુરક્ષા કરો"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે. સુરક્ષિત થવા માટે એક બેકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન, PIN અથવા પાસવર્ડ કરતાં ઓછી સુરક્ષિત હોઈ શકે છે. વધારાની સુરક્ષા માટે, એક બેકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"પાસવર્ડ સેટ કરવામાં આવ્યો છે"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN સેટ કરવામાં આવ્યો છે"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"પેટર્ન સેટ કરવામાં આવી છે"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"ચાલુ રાખવા માટે તમારી ઉપકરણ પેટર્નનો ઉપયોગ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"ચાલુ રાખવા માટે તમારો ઉપકરણ PIN દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"ચાલુ રાખવા માટે તમારા ઉપકરણનો પાસવર્ડ દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ચાલુ રાખવા માટે તમારી કાર્ય પેટર્નનો ઉપયોગ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ચાલુ રાખવા માટે તમારો કાર્ય PIN દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ચાલુ રાખવા માટે તમારો કાર્ય પાસવર્ડ દાખલ કરો"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ખોટો PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ખોટો પાસવર્ડ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ખોટી પેટર્ન"</string>
@@ -2234,6 +2228,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"અક્ષમ કરો"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"સક્ષમ કરો"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"દૂર કરો"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"વિશ્વાસ કરો"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"સિસ્ટમ CA પ્રમાણપત્રને સક્ષમ કરીએ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"સિસ્ટમ CA પ્રમાણપત્રને અક્ષમ કરીએ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"વપરાશકર્તા CA પ્રમાણપત્રને કાયમ માટે દૂર કરીએ?"</string>
@@ -2511,8 +2506,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"વાઇબ્રેટ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"સ્વયંચાલિત નિયમો"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ખલેલ પાડશો નહીં સૂચિ સેટ કરો"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"ચોક્કસ સમયે તમારા ઉપકરણને ચુપ કરો"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ફક્ત પ્રાધાન્યતા"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ફક્ત એલાર્મ્સ"</string>
@@ -3047,4 +3041,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager દરને મર્યાદિત કરતાં ગણકો ફરીથી સેટ કરીએ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"લૉક સ્ક્રીન સૂચનાઓ નિયંત્રિત કરો"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"સૂચના સામગ્રી બતાવો અથવા છુપાવો"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"સૌથી નાની પહોળાઈ"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ec68369..66a1cfb 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्य लॉक चुनें"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"फ़ोन को सुरक्षित रखें"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"फ़िंगरप्रिंट किसी सशक्त पैटर्न, पिन या पासवर्ड की तुलना में कम सुरक्षित हो सकता है. सुरक्षित रहने के लिए बैकअप लॉक स्क्रीन सेट करें."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न, पिन या पासवर्ड की तुलना में कम सुरक्षित हो सकता है. अतिरिक्त सुरक्षा के लिए, एक बैकअप स्क्रीन लॉक सेट करें."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस टैबलेट का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"अक्षम करें"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"सक्षम करें"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"निकालें"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"भरोसा"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"सिस्‍टम CA प्रमाणपत्र सक्षम करना है?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"सिस्‍टम CA प्रमाणपत्र अक्षम करना है?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"स्‍थायी रूप से उपयोगकर्ता CA प्रमाणपत्र निकालना चाहते हैं?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager दर सीमित करने वाले काउंटर रीसेट करें?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन नोटिफ़िकेशन नियंत्रित करें"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"नोटिफ़िकेशन की सामग्री दिखाएं या छिपाएं"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"न्यूनतम चौड़ाई"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index fc9de90..4ed0752 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -424,7 +424,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje zaslona"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Zaklj. radnim profilom"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisak prsta može biti manje siguran od snažnog uzorka, PIN-a ili zaporke. Postavite pričuvno zaključavanje zaslona za svaki slučaj."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak prsta može biti manje siguran od snažnog uzorka, PIN-a ili zaporke. Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
@@ -2243,6 +2243,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogući"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Omogući"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ukloni"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Smatraj pouzdanim"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Želite li omogućiti sistemski CA certifikat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Želite li onemogućiti sistemski CA certifikat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Želite li trajno ukloniti korisnički CA certifikat?"</string>
@@ -3066,4 +3067,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Želite li poništiti brojače ograničenja brzine ShortcutManagera?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavijesti zaključanog zaslona"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikazivanje ili sakrivanje sadržaja obavijesti"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bffc1f1..8e6f9bf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Munkaprofil – zárolás"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Óvja meg telefonját"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Az ujjlenyomat kevésbé biztonságos lehet, mint egy jó minta, PIN-kód vagy jelszó. A biztonság kedvéért állítsa be a tartalék lezárási képernyőt."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Az ujjlenyomat kevésbé biztonságos lehet, mint egy bonyolult minta, PIN-kód vagy jelszó. A nagyobb biztonság kedvéért állítson be tartalék képernyőzárat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a táblagépet. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A jelszó beállítva"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN-kód beállítva"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"A minta beállítva"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"A folytatáshoz használja eszköze feloldó mintáját"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"A folytatáshoz írja be eszköze PIN-kódját"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"A folytatáshoz írja be eszköze jelszavát"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"A folytatáshoz használja munkaprofil-feloldási mintáját"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"A folytatáshoz írja be munkaprofilja PIN-kódját"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"A folytatáshoz írja be munkaprofilja jelszavát"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Helytelen PIN-kód"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Helytelen jelszó"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Helytelen minta"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Letiltás"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Engedélyezés"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eltávolítás"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Megbízható"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Engedélyezi a rendszer CA tanúsítványát?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Letiltja a rendszer CA tanúsítványát?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Véglegesen eltávolítja a felhasználó CA tanúsítványát?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rezgés"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Csak a prioritást élvezők"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatikus szabályok"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"A „Ne zavarjanak” ütemezése"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Eszköznémítás ütemezése"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Csak prioritásos"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Csak riasztások"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Visszaállítja a ShortcutManager gyakoriságkorlát-számlálóit?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lezárási képernyő értesítéseinek kezelése"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Értesítéstartalom megjelenítése vagy elrejtése"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Legkeskenyebb szélesség"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e932b24..937ab45 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ընտրել կողպէկրանը"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Ընտրեք աշխատանքային պրոֆիլի փականը"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Պաշտպանեք ձեր հեռախոսը"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Ապակողպման հուսալի նախշը, PIN կոդը կամ գաղտնաբառը կարող է մատնահետքից ավելի ապահով լինել: Անվտանգության համար սահմանեք էկրանի կողպման պահուստային եղանակ:"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Ապակողպման հուսալի նախշը, PIN կոդը կամ գաղտնաբառը կարող է մատնահետքից ավելի ապահով լինել: Ավելի ապահով լինելու համար սահմանեք էկրանի կողպման պահուստային եղանակ:"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Կանխեք այս պլանշետի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Կանխեք այս սարքի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Կանխեք այս հեռախոսի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Գաղտնաբառը սահմանված է"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-ը սահմանված է"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Նախշը կարգավորված է"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Շարունակելու համար օգտագործեք սարքի նախշը"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Շարունակելու համար մուտքագրեք սարքի PIN կոդը"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Շարունակելու համար մուտքագրեք սարքի գաղտնաբառը"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Շարունակելու համար օգտագործեք աշխատանքային պրոֆիլի նախշը"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Շարունակելու համար մուտքագրեք աշխատանքային պրոֆիլի PIN կոդը"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Շարունակելու համար մուտքագրեք աշխատանքային պրոֆիլի գաղտնաբառը"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN կոդը սխալ է"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Գաղտնաբառը սխալ է"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Նախշը սխալ է"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Կասեցնել"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Միացնել"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Հեռացնել"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Վստահել"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ապաակտիվացնե՞լ համակարգի CA վկայագիրը:"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Ապաակտիվացնե՞լ համակարգի CA վկայագիրը:"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Ժամանակավորապես հեռացնե՞լ օգտվողի CA վկայագիրը:"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևորները"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Ինքնաշխատ կանոններ"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Կարգավորեք Չընդհատելու ժամանակացույցը"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Լռեցրեք սարքը որոշ դեպքերում"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Միայն կարևորները"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Միայն զարթուցիչը"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Վերակայե՞լ ShortcutManager-ի արագության սահմանափակման հաշվիչները:"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Վերահսկել կողպէկրանի ծանուցումները"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ցույց տալ կամ թաքցնել ծանուցման բովանդակությունը"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Ամենափոքր լայնությունը"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cf0a0fa..ac93448 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Pilih kunci profil kerja"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Lindungi ponsel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Sidik jari mungkin kurang aman dibanding pola, PIN, atau sandi yang rumit. Siapkan layar kunci cadangan agar aman."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Sidik jari mungkin kurang aman dibanding pola, PIN, atau sandi yang rumit. Untuk tambahan keamanan, siapkan kunci layar cadangan."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cegah orang lain menggunakan tablet ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Sandi telah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN telah ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pola telah ditetapkan"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Gunakan pola perangkat untuk melanjutkan"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Masukkan PIN perangkat untuk melanjutkan"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Masukkan sandi perangkat untuk melanjutkan"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gunakan pola kerja untuk melanjutkan"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Masukkan PIN kerja untuk melanjutkan"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Masukkan sandi kerja untuk melanjutkan"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN Salah"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Sandi salah"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pola salah"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Nonaktifkan"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktifkan"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Hapus"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Percayai"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Aktifkan sertifikat CA sistem?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Nonaktifkan sertifikat CA sistem?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Hapus sertifikat CA pengguna secara permanen?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Getar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Hanya izinkan prioritas"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Aturan otomatis"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Setel jadwal Jangan Ganggu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Bisukan perangkat pada waktu tertentu"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Hanya untuk prioritas"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Hanya alarm"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Setel ulang penghitung pembatasan kecepatan PengelolaPintasan?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Mengontrol notifikasi layar kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Menampilkan atau menyembunyikan konten notifikasi"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 4e02e9a..465646d 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Veldu skjálás"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Veldu vinnulás"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Auktu öryggi símans"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Hugsanlegt er að notkun fingrafara sé ekki jafnörugg og mynstur, PIN-númer eða aðgangsorð. Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Hugsanlegt er að notkun fingrafara sé ekki jafnörugg og mynstur, PIN-númer eða aðgangsorð. Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Aðgangsorð hefur verið valið"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-númer var valið"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mynstur hefur verið valið"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Teiknaðu mynstrið þitt fyrir tækið til að halda áfram"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Sláðu inn PIN-númerið þitt fyrir tækið til að halda áfram"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Sláðu inn aðgangsorðið þitt fyrir tækið til að halda áfram"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Notaðu vinnumynstrið þitt til að halda áfram"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Sláðu inn PIN-númerið þitt fyrir vinnuna til að halda áfram"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Sláðu inn vinnuaðgangsorðið þitt til að halda áfram"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Rangt PIN-númer"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Rangt aðgangsorð"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Rangt mynstur"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Gera óvirkt"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Kveikja"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Fjarlægja"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Treysta"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Gera CA-vottorð kerfis virkt?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Gera CA-vottorð kerfis óvirkt?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Fjarlægja CA-vottorð notanda fyrir fullt og allt?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titringur"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Aðeins forgangsheimildir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sjálfvirkar reglur"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Stilla „Ónáðið ekki“ áætlun"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Taka hljóðið af tækinu á vissum tímum"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Aðeins forgangur"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Aðeins vekjarar"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Endurstilla ShortcutManager teljara með hraðatakmörkun?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Stjórna skjálásstilkynningum"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Sýna eða fela efni tilkynninga"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Minnsta breidd"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b9d2f14..3dc10c3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Blocco schermo"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Scegli blocco lavoro"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteggi il telefono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"L\'impronta digitale potrebbe essere meno sicura di una sequenza, una password o un PIN efficaci. Per sicurezza, configura una schermata di blocco di backup."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"L\'impronta digitale potrebbe essere meno sicura di una sequenza, una password o un PIN efficaci. Per sicurezza, configura una schermata di blocco di backup."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disattiva"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Attiva"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Rimuovi"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Fiducia"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Abilitare il certificato CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disabilitare il certificato CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Rimuovere definitivamente il certificato CA dell\'utente?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reimpostare i contatori del limite di frequenza in ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlla notifiche in schermata blocco"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o nascondi i contenuti delle notifiche"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Larghezza minima"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c2fb665..8222e65 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"נעילת מסך"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"בחירת מנעול עבודה"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"הגן על הטלפון שלך"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"הערה: טביעת האצבע עשויה להיות בטוחה פחות מאשר קו ביטול נעילה, קוד גישה או סיסמה חזקים. הגדר נעילת מסך כגיבוי ליתר ביטחון."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"טביעת האצבע עשויה להיות בטוחה פחות מאשר קו ביטול נעילה, קוד גישה או סיסמה חזקים. הגדר נעילת מסך כגיבוי ליתר ביטחון."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטאבלט הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש במכשיר הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטלפון הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
@@ -2260,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"השבת"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"הפעל"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"הסר"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ניתן לבטוח"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"‏להפעיל את אישור ה-CA של המערכת?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"‏להשבית את אישור ה-CA של המערכת?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"‏להסיר לצמיתות את אישור ה-CA של המשתמש?"</string>
@@ -3096,4 +3097,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏האם לאפס מונים להגבלת דירוג ב-ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"שליטה בהודעות של מסך הנעילה"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"הצג או הסתר תוכן הודעה"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"dp <xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"הרוחב הקטן ביותר"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 661b081..a6b8fc8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"仕事用ロックの選択"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"スマートフォンの保護"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"指紋は、複雑なパターン、PIN、パスワードよりも安全面で劣る可能性があります。バックアップのロック画面を設定して安全を確保してください。"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"指紋は、複雑なパターン、PIN、パスワードよりも安全面で劣る可能性があります。セキュリティを強化するには、予備の画面ロック方式を設定してください。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"このタブレットが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"この端末が他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"このスマートフォンが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
@@ -2230,6 +2230,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"無効にする"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"有効にする"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"削除"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"信頼する"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"システムのCA証明書を有効にしますか？"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"システムのCA証明書を無効にしますか？"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ユーザーのCA証明書を完全に削除しますか？"</string>
@@ -3042,4 +3043,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager のレート制限カウンタをリセットしますか？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ロック画面の通知を管理"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"通知内容の表示と非表示を切り替える"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"最小幅"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c98eeca..dfce0c5 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"აირჩიეთ ეკრანის დამბლოკველი"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"სამს. დაბლოკვის არჩევა"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"დაიცავით ტელეფონი"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე, PIN-კოდზე ან პაროლზე ნაკლებად საიმედო იყოს. დააყენეთ ეკრანის დაბლოკვის სარეზერვო ხერხი, რათა დაცული იყოთ."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"თქვენი თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე, PIN-კოდზე ან პაროლზე ნაკლებად საიმედო იყოს. დააყენეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტაბლეტი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს მოწყობილობა ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტელეფონი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"პაროლი გაიგზავნა"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-კოდი გაიგზავნა"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"გრაფიკული გასაღები გაიგზავნა"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"გასაგრძელებლად, გამოიყენეთ თქვენი მოწყობილობის ნიმუში"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"გასაგრძელებლად, შეიყვანეთ თქვენი მოწყობილობის PIN-კოდი"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"გასაგრძელებლად, შეიყვანეთ თქვენი მოწყობილობის პაროლი"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"გასაგრძელებლად, გამოიყენეთ თქვენი სამსახურის ნიმუში"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"გასაგრძელებლად, შეიყვანეთ თქვენი სამსახურის PIN-კოდი"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"გასაგრძელებლად, შეიყვანეთ თქვენი სამსახურის პაროლი"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"არასწორი PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"არასწორი პაროლი"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"არასწორი ნიმუში"</string>
@@ -1554,7 +1548,7 @@
     <string name="keyboard_and_input_methods_category" msgid="212319666432360385">"კლავიატურა და შეყვანის მეთოდები"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"ვირტუალური კლავიატურა"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"ხელმისაწვდომი ვირტუალური კლავიატურა"</string>
-    <string name="add_virtual_keyboard" msgid="5783399159348480135">"ვირტუალური კლავიატურების დამატება ან რედაქტირება"</string>
+    <string name="add_virtual_keyboard" msgid="5783399159348480135">"კლავიატურების დამატება/რედაქტირება"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"კლავიატურის დახმარება"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"ფიზიკური კლავიატურა"</string>
     <string name="show_ime" msgid="2658582193437188227">"ვირტუალური კლავიატურის ჩვენება"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"გაუქმება"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ჩართვა"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ამოშლა"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ნდობით აღჭურვა"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ჩაირთოს სისტემის CA სერტიფიკატი?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"გამოირთოს სისტემის CA სერტიფიკატი?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"სამუდამოდ წაიშალოს CA სერტიფიკატი?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ვიბრაცია"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"დაუშვას მხოლოდ პრიორიტეტულები"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ავტომატური წესები"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"„არ შემაწუხოთ“ რეჟიმის განრიგი"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"გარკვეულ დროს მოწყობილობის დადუმება"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"მხოლოდ პრიორიტეტული"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"მხოლოდ მაღვიძარები"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"გსურთ ShortcutManager-ის სიხშირის შემზღუდველი მთვლელების გადაყენება?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"მართეთ შეტყობინებები ჩაკეტილ ეკრანზე"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"შეტყობინების კონტენტის ჩვენება ან დამალვა"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"უმცირესი სიგანე"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 5dd75f9..8869e6a 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Экранды құлпын таңдау"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Жұмыс құлпын таңдау"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Телефонды қорғау"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Саусақ ізінің қауіпсіздігі күшті өрнектен, PIN кодынан немесе кілтсөзден азырақ болуы мүмкін. Қорғау үшін қосалқы бекіту экранын реттеңіз."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Саусақ ізінің қауіпсіздігі күшті өрнектен, PIN кодынан немесе құпия сөзден азырақ болуы мүмкін. Қауіпсіздікті арттыру үшін қосалқы экран құлпын реттеңіз."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"құрылғы қорғау мүмкіндіктерін іске қосу арқылы сіздің рұқсатыңызсыз планшетті басқалардың пайдалануына жол бермеңіз. Пайдаланғыңыз келетін экран құлпын таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы құрылғыны рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы телефонды рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
@@ -1309,7 +1309,7 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Кілтсөз тағайындалды"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN тағайындалды"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Кескін реттелді"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Жалғастыру үшін құрылғы өрнегін енгізіңіз"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Жалғастыру үшін құрылғының құлып өрнегін пайдаланыңыз"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Жалғастыру үшін құрылғы PIN кодын енгізіңіз"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Жалғастыру үшін құрылғы құпия сөзін енгізіңіз"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Жалғастыру үшін жұмыс өрнегін пайдаланыңыз"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Өшіру"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Қосу"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Алыптастау"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Сену"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Жүйенің CA сертификаты қосылсын ба?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Жүйенің CA сертификаты өшірілсін бе?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Пайдаланушы РА сертификаты мүлдем алынсын ба?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager жылдамдықты шектеу есептегіштерін бастапқы күйіне қайтару керек пе?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Құлыпталған экран хабарландыруларын бақылау"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Хабарландыру мазмұнын көрсету немесе жасыру"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> нүкте/дюйм"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Ең кішкентай ен"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 115a2b1..eb3317e 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ជ្រើស​ការ​ចាក់សោ​អេក្រង់"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ជ្រើសការចាក់សោការងារ"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ការពារទូរស័ព្ទរបស់អ្នក"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ស្នាមម្រាមដៃអាចមានសុវត្ថិភាពតិចជាលំនាំ កូដ PIN ឬពាក្យសម្ងាត់រឹងមាំ។ ដំឡើងអេក្រង់ចាក់សោបម្រុងដើម្បីឲ្យមានសុវត្ថិភាព។"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ស្នាមម្រាមដៃរបស់អ្នកអាចនឹងមិនសូវមានសុវត្ថិភាពដូចលំនាំ កូដ PIN ឬពាក្យសម្ងាត់ដែលរឹងមាំនោះទេ។ សម្រាប់សុវត្ថិភាពបន្ថែម សូមដំឡើងអេក្រង់ចាក់សោបម្រុង។"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើថេប្លេតនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើឧបករណ៍នេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"បិទ"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"បើក"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"យក​ចេញ"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ជឿទុកចិត្ត"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"បើក​វិញ្ញាបនបត្រ CA ប្រព័ន្ធ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"បិទ​វិញ្ញាបនបត្រ CA ប្រព័ន្ធ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"លុប​វិញ្ញាបនបត្រ CA អ្នកប្រើ​ជា​អចិន្ត្រៃយ៍?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"កំណត់កម្មវិធីរាប់ការកំណត់អត្រា ShortcutManager ឡើងវិញឬ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"គ្រប់គ្រងការជូនដំណឹងអេក្រង់ចាក់សោ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"បង្ហាញ ឬលាក់មាតិកាជូនដំណឹង"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"ទទឹងតូចបំផុត"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 856bac6..8c63e0e 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ಕೆಲಸದ ಲಾಕ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ಬಲವಾದ ಪ್ಯಾಟರ್ನ್, ಪಿನ್‌ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ಗಿಂತ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು. ಸುರಕ್ಷಿತವಾಗಿರಲು ಬ್ಯಾಕಪ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಹೊಂದಿಸಿ."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ಬಲವಾದ ಪ್ಯಾಟರ್ನ್, ಪಿನ್, ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ಗಿಂತ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು. ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ಬ್ಯಾಕಪ್‌ ಪರದೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಸಾಧನವನ್ನು ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಫೋನ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ತೆಗೆದುಹಾಕು"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ವಿಶ್ವಾಸಾರ್ಹ"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ಸಿಸ್ಟಂ CA ಪ್ರಮಾಣಪತ್ರವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ಸಿಸ್ಟಂ CA ಪ್ರಮಾಣಪತ್ರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ಬಳಕೆದಾರರ CA ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕುವುದೇ?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager ನ ದರ-ಸೀಮಿತಗೊಳಿಸುವಿಕೆ ಕೌಂಟರ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ಲಾಕ್‌ ಪರದೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ಅಧಿಸೂಚನೆಯ ವಿಷಯವನ್ನು ತೋರಿಸು ಅಥವಾ ಮರೆಮಾಡು"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"ಚಿಕ್ಕದಾದ ಅಗಲ"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6fb580f..23270a6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"직장 잠금 선택"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"휴대전화 보호"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"지문은 강력한 패턴, PIN, 비밀번호보다 안전하지 못합니다. 보안을 유지하려면 백업 잠금 화면을 설정하세요."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"지문은 강력한 패턴이나 PIN, 비밀번호보다 안전하지 못합니다. 보안을 강화하려면 백업 화면 잠금을 설정하세요."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 태블릿을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 기기를 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 스마트폰을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"사용 중지"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"사용"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"삭제"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"신뢰하기"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"시스템 CA 인증서를 사용하시겠습니까?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"시스템 CA 인증서를 사용 중지하시겠습니까?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"사용자 CA 인증서를 영구 삭제하시겠습니까?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager 대역 제한 카운터를 재설정하시겠습니까?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"잠금 화면 알림 제어"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"알림 내용 표시 또는 숨기기"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g>dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"최소 폭"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 2814989..a70d4c7 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Экран бекитүүнү тандоо"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Жумш прф кулпсн тандоо"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Телефонуңузду коргоңуз"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Эскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч, PIN код же сырсөз менен коргоо бир кыйла коопсуз. Коопсуздук үчүн экран кулпусунун камдык көчүрмөсүн жөндөп коюңуз."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч, PIN код же сырсөз менен коргоо бир кыйла коопсуз. Кошумча коопсуздук үчүн, көмөкчү экран кулпусун жөндөп коюңуз."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул планшетти сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул түзмөктү сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул телефонду сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Сырсөз коюлду"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN код коюлду"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Сүрөт үлгүсү коюлду"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Улантуу үчүн түзмөгүңүздүн графикалык ачкычын колдонуңуз"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Улантуу үчүн түзмөгүңүздүн PIN кодун киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Улантуу үчүн түзмөгүңүздүн сырсөзүн киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Улантуу үчүн жумуш профилиңиздин графикалык ачкычын колдонуңуз"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Улантуу үчүн жумуш профилиңиздин PIN кодун киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Улантуу үчүн жумуш профилиңиздин сырсөзүн киргизиңиз"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN код туура эмес"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Сырсөз туура эмес"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Үлгү туура эмес"</string>
@@ -1554,7 +1548,7 @@
     <string name="keyboard_and_input_methods_category" msgid="212319666432360385">"Баскычтоп жана киргизүү ыкмалары"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Виртуалдык баскычтоп"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Жеткиликтүү виртуалдык баскычтоп"</string>
-    <string name="add_virtual_keyboard" msgid="5783399159348480135">"Виртуалдык баскчтп кошңз же түзөтңз"</string>
+    <string name="add_virtual_keyboard" msgid="5783399159348480135">"Виртуалдык тергич кошуу же түзөтүү"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Баскычтоп боюнча жардам"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Аппараттык баскычтоп"</string>
     <string name="show_ime" msgid="2658582193437188227">"Виртуалдык баскычтопту көрсөтүү"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Өчүрүү"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Иштетүү"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Алып салуу"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Ишеничтүү"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Тутумдун CA тастыктамасы күйгүзүлсүнбү?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Тутумдун CA тастыктамасы өчүрүлсүнбү?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Колдонуучунун CA тастыктамасы биротоло алынып салынсынбы?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дирилдөө"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Артыкчылыктууга гана уруксат"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматтык эрежелер"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\"Тынчымды алба\" режимин коюу"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Түзмөктүн үнүн өчүрүүнү жөндөө"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Артыкчылык гана"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкучтар гана"</string>
@@ -2818,7 +2812,7 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Четке кагуу"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Бул түзмөктү кубаттоо"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Жөн гана бул түзмөктү кубаттоо"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Электр кубатынын өткөрүп берүү"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Электр кубатын өткөрүп берүү"</string>
     <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Туташып турган башка түзмөккө электр кубатын өткөрүп берүү"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Файлдарды өткөрүү"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Файлдарды башка түзмөккө өткөрүңүз"</string>
@@ -2826,7 +2820,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Эгер MTP колдоого алынбаса, сүрөттөрдү же файлдарды өткөрүү (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Түзмөктү MIDI катары колдонуу"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Бул түзмөктү MIDI катары колдонуу"</string>
-    <string name="usb_use" msgid="3256040963685055320">"USB туташууну төмөнкү үчүн колдонуу"</string>
+    <string name="usb_use" msgid="3256040963685055320">"USB туташууну төмөнкү максатта колдонуу"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Фондо текшерүү"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Фондук режимде толук мүмкүнчүлүк"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Экрандагы текстти колдонуу"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager\'дин ылдамдыкты чектөөчү эсептегичтери баштапкы абалга келтирилсинби?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Кулпуланган экрндг эскртмнлрд көзөмөлдөө"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Эскертме мазмунун көрсөтүү же жашыруу"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Эң ичке"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 67cc075..44c59d1 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ເລືອກການລັອກໜ້າຈໍ"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ເລືອກການລັອກບ່ອນເຮັດວຽກ"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ປົກ​ປ້ອງ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ລາຍນິ້ວມືອາດຈະມີຄວາມປອດໄພໜ້ອຍກວ່າການໃຊ້ຮູບແບບ, PIN ຫຼື ລະຫັດຜ່ານທີ່ເດົາຍາກ. ໃຫ້ຕັ້ງໜ້າຈໍລັອກສຳຮອງໄວ້ເພື່ອຄວາມປອດໄພ."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ລາຍນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພໜ້ອຍກວ່າຮູບແບບການປົດລັອກ, PIN ຫຼື ລະຫັດທີ່ຍາກ. ເພື່ອຄວາມປອດໄພທີ່ສູງຂຶ້ນ, ທ່ານຄວນຕັ້ງການລັອກໜ້າຈໍສຳຮອງ."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ຕັ້ງລະຫັດຜ່ານແລ້ວ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ຕັ້ງລະຫັດ PIN ແລ້ວ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ຕັ້ງຮູບແບບແລ້ວ"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"ໃຊ້ຮູບແບບປົດລັອກອຸປະກອນຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"ປ້ອນ PIN ອຸປະກອນຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"ປ້ອນລະຫັດຜ່ານອຸປະກອນຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ໃຊ້ຮູບແບບປົດລັອກບ່ອນເຮັດວຽກຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ປ້ອນ PIN ບ່ອນເຮັດວຽກຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ປ້ອນລະຫັດຜ່ານບ່ອນເຮັດວຽກຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ລະຫັດຜ່ານ​ບໍ່ຖືກຕ້ອງ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ຮູບແບບປົດ​ລັອກ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ປິດໃຊ້ງານ"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ເປິດນຳໃຊ້"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ລຶບອອກ"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ເຊື່ອຖື"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ເປີດນຳໃຊ້ໃບຮັງຮອງ CA ຂອງລະບົບ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ປິດການນຳໃຊ້ໃບຮັບຮອງລະບົບ CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ລຶບໃບຮັບຮອງ CA ຜູ່ໃຊ້ອອກຖາວອນ?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ສັ່ນເຕືອນ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ທີ່​ອະ​ນຸ​ຍາດ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ກົດ​ລະ​ບຽບ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ຕັ້ງກຳນົດເວລາຫ້າມລົບກວນ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"ປິດສຽງອຸປະກອນຂອງທ່ານໃນບາງເວລາ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ບຸ​ລິ​ມະ​ສິດເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
@@ -3045,4 +3039,9 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ຣີເຊັດຕົວນັບການຈຳກັດອັດຕາ ShortcutManager ບໍ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ຄວບຄຸມການແຈ້ງເຕືອນໃນໜ້າຈໍລັອກ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ສະແດງ ຫຼື ເຊື່ອງເນື້ອຫາການແຈ້ງເຕືອນ"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"ຄວາມກວ້າງນ້ອຍທີ່ສຸດ"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງຮ້ອງຂໍການເຂົ້າເຖິງ SMS ແບບພຣີມຽມ"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"SMS ແບບພຣີມຽມອາດເຮັດໃຫ້ທ່ານເສຍເງິນ ແລະ ຈະເພີ່ມຄ່າໃຊ້ຈ່າຍໃຫ້ກັບບິນຜູ້ໃຫ້ບໍລິການຂອງທ່ານ. ຫາກທ່ານເປີດໃຊ້ສິດອະນຸຍາດໃຫ້ກັບແອັບໃດໜຶ່ງ, ທ່ານຈະສາມາດສົ່ງ SMS ແບບພຣີມຽມໂດຍໃຊ້ແອັບນັ້ນໄດ້."</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"ການເຂົ້າເຖິງ SMS ແບບພຣີມຽມ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ad97837..eb45b70 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Pasir. darbo užraktą"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Apsaugokite savo telefoną"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Kontrolinis kodas gali būti mažiau saugus nei sudėtingas atrakinimo piešinys, PIN kodas ar slaptažodis. Nustatykite atsarginį užrakinimo ekraną, kad būtumėte apsaugoti."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Kontrolinis kodas gali būti mažiau saugus nei sudėtingas atrakinimo piešinys, PIN kodas ar slaptažodis. Kad paskyra būtų saugesnė, nustatykite atsarginį ekrano užraktą."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Slaptažodis nustatytas"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kodas nustatytas"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelis nustatytas"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Jei norite tęsti, naudokite įrenginio atrakinimo piešinį"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Jei norite tęsti, įveskite įrenginio PIN kodą"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Jei norite tęsti, įveskite įrenginio slaptažodį"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Jei norite tęsti, naudokite darbo atrakinimo piešinį"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Jei norite tęsti, įveskite darbo PIN kodą"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Jei norite tęsti, įveskite darbo slaptažodį"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Netinkamas PIN kodas"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Netinkamas slaptažodis"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Netinkamas piešinys"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Išjungti"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Įgalinti"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Pašalinti"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Pasitikėti"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Įgalinti sistemos CA sertifikatą?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Neleisti sistemos CA sertifikato?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Visam laikui pašalinti naudotojo CA sertifikatą?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibravimas"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tik pagal prioritetą"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatinės taisyklės"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nust. netrukd. režimo tvarkar."</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Nutild. įreng. tam tikru metu"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tik prioritetiniai"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tik įspėjimai"</string>
@@ -3103,4 +3097,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Iš naujo nustatyti „ShortcutManager“ įkainius ribojančius skaitiklius?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Užrakinimo ekrano pranešimų valdymas"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rodykite arba slėpkite pranešimo turinį"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Mažiausias plotis"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b2e26ee..d146511 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -424,7 +424,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izv. ekrāna bloķēš."</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Darba profila bloķēšana"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Aizsargājiet tālruni"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija, PIN kods vai parole. Papildu drošībai iestatiet rezerves bloķēšanas ekrānu."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija, PIN kods vai parole. Papildu drošībai iestatiet rezerves bloķēšanas ekrānu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
@@ -1319,18 +1319,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parole ir iestatīta"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kods ir iestatīts"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kombinācija ir iestatīta"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Lai turpinātu, izmantojiet ierīces kombināciju."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Lai turpinātu, ievadiet ierīces PIN kodu."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Lai turpinātu, ievadiet savas ierīces paroli."</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Lai turpinātu, izmantojiet darba profila kombināciju."</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Lai turpinātu, ievadiet darba profila PIN kodu."</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Lai turpinātu, ievadiet darba profila paroli."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nepareizs PIN kods"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nepareiza parole"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nepareiza kombinācija"</string>
@@ -2249,6 +2243,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Atspējot"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Iespējot"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Noņemt"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Uzticamība"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vai iespējot sistēmas CA sertifikātu?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vai atspējot sistēmas CA sertifikātu?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vai neatgriezeniski noņemt lietotāja CA sertifikātu?"</string>
@@ -2526,8 +2521,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrozvans"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tikai prioritārie"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Autom. kārtulas"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Iestatīt “Netraucēt” grafiku"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Iest. skaņas izsl. noteiktā laikā"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tikai prioritārie pārtraukumi"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tikai signāli"</string>
@@ -3073,4 +3067,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vai atiestatīt ShortcutManager ātruma ierobežošanas skaitītājus?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Bloķēšanas ekrāna paziņojumu kontrole"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rādīt vai slēpt paziņojumu saturu"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Mazākais platums"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 0cf69a1..2ec29b2 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избери заклучување на екранот"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Избери закл. раб. профил"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Заштитете го телефонот"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Отпечатокот можеби е помалку безбеден од шема, ПИН или лозинка. Поставете резервен заклучен екран за да бидете безбедни."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Вашиот отпечаток можеби е помалку безбеден од силна шема или ПИН. За дополнителна безбедност, поставете резервен заклучен екран."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречете ги другите да го користат уредот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
@@ -1310,10 +1310,10 @@
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-от е поставен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Шемата е поставена"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Користете ја шемата на уредот за да продолжите"</string>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Внесете го ПИН-кодот на уредот за да продолжите"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Внесете го PIN-кодот на уредот за да продолжите"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Внесете ја лозинката на уредот за да продолжите"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Користете ја шемата на работниот профил за да продолжите"</string>
-    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Внесете го ПИН-кодот на работниот профил за да продолжите"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Внесете го PIN-кодот на работниот профил за да продолжите"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Внесете ја лозинката на работниот профил за да продолжите"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Погрешен ПИН"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Погрешна лозинка"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Оневозможи"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Овозможи"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Отстрани"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Доверба"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Овозможи го системскиот CA сертификат?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Оневозможи го системскиот CA сертификат?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Трајно отстрани го корисничкиот CA сертификат?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Ресетирајте ги бројачите за ограничување оцени на ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролирајте ги известувањата на заклучениот екран"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прикажете или сокријте содржина на известување"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Најмала ширина"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index dfb0591..11476a4 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"സ്‌ക്രീൻലോക്ക് തിരഞ്ഞെടുക്കൂ"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ഔദ്യോഗിക ലോക്ക് തിരഞ്ഞെടുക്കുക"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ഫോൺ പരിരക്ഷിക്കുക"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ശക്തമായ പാറ്റേൺ, പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ് എന്നിവയെ അപേക്ഷിച്ച് ഫിംഗർപ്രിന്റിന്റെ സുരക്ഷിതത്വം കുറവായിരിക്കാം. സുരക്ഷിതമായിരിക്കുന്നതിന് ഒരു ബാക്കപ്പ് ലോക്ക് സ്ക്രീൻ സജ്ജമാക്കുക."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ശക്തമായ പാറ്റേൺ, പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ് എന്നിവയെ അപേക്ഷിച്ച് ഫിംഗർപ്രിന്റിന്റെ സുരക്ഷിതത്വം കുറവായിരിക്കാം. വർദ്ധിത സുരക്ഷയ്ക്ക്, ഒരു ബാക്കപ്പ് ലോക്ക് സ്ക്രീൻ സജ്ജമാക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഉപകരണം ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഫോൺ ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"പാസ്‌വേഡ് സജ്ജീകരിച്ചു"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"പിൻ സജ്ജീകരിച്ചു"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"പാറ്റേൺ സജ്ജീകരിച്ചു"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"തുടരാൻ നിങ്ങളുടെ ഉപകരണ പാറ്റേൺ ഉപയോഗിക്കുക"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"തുടരാൻ ഉപകരണ പിൻ നൽകുക"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"തുടരാൻ നിങ്ങളുടെ ഉപകരണ പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പാറ്റേൺ ഉപയോഗിക്കുക"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പിൻ നൽകുക"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പാസ്‌വേഡ് നൽകുക"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"പിൻ തെറ്റാണ്"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"പാറ്റേൺ തെറ്റാണ്"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"നീക്കംചെയ്യുക"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"പരിചിതം"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"സി‌സ്റ്റം CA സർട്ടിഫിക്കറ്റ് പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"സി‌സ്റ്റം CA സർട്ടിഫിക്കറ്റ് പ്രവർത്തനരഹിതമാക്കണോ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ഉപയോക്തൃ CA സർട്ടിഫിക്കറ്റ് ശാശ്വതമായി നീക്കംചെയ്യണോ?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണനയുള്ളവ മാത്രം"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"സ്വയമേയുള്ള നയങ്ങൾ"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\'ശല്യപ്പെടുത്തരുത്\' ഷെഡ്യൂൾ സജ്ജമാക്കുക"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"ചില സമയങ്ങളിൽ ഉപകരണം നിശബ്ദമാക്കുക"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"മുൻഗണന മാത്രം"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"അലാറങ്ങൾ മാത്രം"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"കുറുക്കുവഴിമാനേജർ നിരക്ക്-പരിമിതപ്പെടുത്തൽ കൗണ്ടറുകൾ പുനഃക്രമീകരിക്കണോ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ലോക്ക് സ്ക്രീൻ അറിയിപ്പുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"അറിയിപ്പ് ഉള്ളടക്കം കാണിക്കുക അല്ലെങ്കിൽ മറയ്ക്കുക"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"ഏറ്റവും ചെറിയ വീതി"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 26c781a..15a7003 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Дэлгэцийн түгжээг сонгоно уу"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Ажлын түгжээсийг сонгох"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Утсаа хамгаалах"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Хурууны хээ нь сайн зурган түгжээ, PIN, нууц үгийг бодвол хамгаалалт муутай байж болзошгүй. Хамгаалалттай байхын тулд нөөцлөх түгжээг тохируулна уу."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Хурууны хээ нь сайн зурган түгжээ, ПИН болон нууц үгнээс хамгаалалт муутай байдаг. Хамгаалалтыг сайжруулахын тулд дэлгэцийн нөөц түгжээ тохируулна уу."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ таблетийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ төхөөрөмжийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ утсыг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
@@ -2216,6 +2216,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Идэвхгүйжүүлэх"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Идэвхжүүлэх"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Устгах"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Итгэх"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Системийн CA сертификатыг идэвхжүүлэх үү?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Системийн CA сертификатыг идэвхгүйжүүлэх үү?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Хэрэглэгчийн CA сертификатыг бүрмөсөн арилгах уу?"</string>
@@ -3026,4 +3027,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager үнэлгээ хязгаарлалтын тоолуурыг дахин тохируулах уу?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Дэлгэцийн түгжээний мэдэгдлийг хянах"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Харуулах эсвэл нуух мэдэгдлийн агуулга"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Хамгийн бага өргөн"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index e38e3b9..29480a0 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रीन लॉक निवडा"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्य लॉक निवडा"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"आपला फोन संरक्षित करा"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"आपले फिंगरप्रिंट सशक्त नमुना किंवा पिन किंवा संकेतशब्दापेक्षा कमी सुरक्षित असू शकते. सुरक्षित असण्यासाठी बॅकअप लॉक स्क्रीन सेट करा."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"आपले फिंगरप्रिंट मजबूत नमुना, पिन किंवा संकेतशब्दापेक्षा कमी सुरक्षित असू शकतात. अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"अक्षम करा"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"सक्षम करा"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"काढा"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"विश्वास"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"सिस्टम CA प्रमाणपत्र सक्षम करायचे?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"सिस्टम CA प्रमाणपत्र अक्षम करायचे?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"वापरकर्ता CA प्रमाणपत्र कायमचे काढायचे?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager दर-मर्यादित करणे काउंटर रीसेट करायचे?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन सूचना नियंत्रित करा"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सामग्री दर्शवा किंवा लपवा"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"सर्वात लहान रुंदी"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 29a071e..a67f6c1 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Pilih kunci kerja"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Lindungi telefon anda"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Cap jari mungkin kurang selamat berbanding corak, PIN atau kata laluan yang kukuh. Sediakan skrin kunci sandaran untuk lebih selamat."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Cap jari anda mungkin kurang selamat berbanding corak, PIN atau kata laluan yang kukuh. Untuk keselamatan tambahan, sediakan kunci skrin sandaran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Halang orang lain daripada menggunakan tablet ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Kata laluan sudah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN belum ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Corak sudah ditetapkan"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Gunakan corak peranti anda untuk meneruskan"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Masukkan PIN peranti anda untuk meneruskan"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Masukkan kata laluan peranti anda untuk meneruskan"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gunakan corak kerja anda untuk meneruskan"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Masukkan PIN kerja anda untuk meneruskan"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Masukkan kata laluan kerja anda untuk meneruskan"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN salah"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Kata laluan salah"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Corak salah"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Lumpuhkan"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Dayakan"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Alih keluar"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Percaya"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Dayakan sijil CA sistem?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lumpuhkan sijil CA sistem?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Alih keluar sijil CA pengguna secara kekal?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Bergetar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Benarkan keutamaan sahaja"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Peraturan automatik"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Tetapkan jadual Jangan Ganggu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Snypkan peranti pd masa trtntu"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Keutamaan sahaja"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Penggera sahaja"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Tetapkan semula pembilang had kadar ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kawal pemberitahuan skrin kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Tunjukkan atau sembunyikan kandungan pemberitahuan"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 6327df7..09b043c 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"မျက်နှာပြင်သော့ပိတ်နည်းရွေးရန်"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"အလုပ် လော့ခ်ချခြင်းကို ရွေးပါ"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"သင့်ဖုန်းကို ကာကွယ်ပါ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"လက်ဗွေသည် လုံခြုံသည့် ပုံစံ၊ ပင်နံပါတ် သို့မဟုတ် စကားဝှက်ထက် လုံခြုံမှုပိုအားနည်းပါသည်။ လုံခြုံမှုရှိစေရန် အရန်လော့ခ်ချထားသည့်မျက်နှာပြင်တစ်ခုကို ထည့်သွင်းပါ။"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"သင့်လက်ဗွေသည် လုံခြုံသည့် ပုံစံ၊ ပင်နံပါတ် သို့မဟုတ် စကားဝှက်ထက် ပိုအားနည်းပါသည်။ ထည့်သွင်းထားသည့် စကားဝှက်အတွက် ဖန်သားပြင်လော့ခ်ချခြင်း အရန်စနစ်တစ်ခုကို ထည့်သွင်းပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤတက်ဘလက်ကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤစက်ပစ္စည်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤဖုန်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ပိတ်ထားရန်"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ရနိုင်သည်"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ဖယ်ရှာခြင်း"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ယုံကြည်ပါ"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"စနစ်၏CA လက်မှတ်အား ဖွင့်ထားမလား?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"စနစ်၏CA လက်မှတ်အား ပိတ်ထားမည်"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"အသုံးပြုသူ၏CA လက်မှတ်အား ထာဝရဖယ်ရှားမည်လား?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager နှုန်းကန့်သတ်ခြင်း ရေတွက်စနစ်ကို ပြန်လည်သတ်မှတ်မလား။"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"လော့ခ်မျက်နှာပြင် အကြောင်းကြားချက်များကို ထိန်းချုပ်ပါ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"အကြောင်းကြားချက်ပါ အကြောင်းအရာများကို ပြပါ သို့မဟုတ် ဝှက်ပါ"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"အသေးဆုံး အကျယ်"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 060b5ac..d312d98 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -336,7 +336,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtrykk er registrert</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås opp med avtrykk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås opp med fingeravtrykk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Du trenger bare å trykke på fingeravtrykkssensoren for å låse opp telefonen din, godkjenne kjøp eller logge på apper. Tenk nøye over hvilke fingeravtrykk du legger til – alle fingeravtrykkene som legges til, kan nemlig utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt er kanskje ikke like sikkert som et sterkt mønster eller en sterk PIN-kode. "<annotation id="url">"Finn ut mer"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsett"</string>
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Velg jobblås"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Beskytt telefonen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Merk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode. Konfigurer en låseskjerm som et reservealternativ for å være sikker."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller passord, eller en sterk PIN-kode. Konfigurer en låseskjerm som et reservealternativ for å være sikker."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
@@ -661,7 +661,7 @@
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer sertifikater"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"For å forbedre posisjonsnøyaktigheten kan systemapper og -tjenester fortsatt oppdage Wi-Fi-nettverk. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ikke vis igjen"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi på i hvilemodus"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behold Wi-Fi på i hvilemodus"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktivert i hvilemodus"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Forbedre effektiviteten"</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Passordet er angitt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kode er angitt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønster er angitt"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Bruk enhetsmønsteret ditt for å fortsette"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Skriv inn enhets-PIN-koden din for å fortsette"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Skriv inn enhetspassordet ditt for å fortsette"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Bruk jobbmønsteret ditt for å fortsette"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Skriv inn jobb-PIN-koden din for å fortsette"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Skriv inn jobbpassordet ditt for å fortsette"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Feil PIN-kode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Feil passord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Feil mønster"</string>
@@ -1639,7 +1633,7 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Teksting"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Forstørrelsesbevegelser"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trykk tre ganger for å zoome"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"For å zoome"</b>", trykk raskt på skjermen tre ganger med én finger.\n"<ul><li>"Dra med to eller flere fingre for å rulle"</li>\n<li>"Klyp sammen to eller flere fingre, eller spre dem fra hverandre, for å justere zoomnivået"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", trykk raskt på skjermen tre ganger og hold inne fingeren på det tredje trykket.\n"<ul><li>"Dra fingeren for å bevege på skjermbildet"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet og navigasjonsraden."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"For å zoome"</b>", trykk raskt på skjermen tre ganger med én finger.\n"<ul><li>"Dra med to eller flere fingre for å rulle"</li>\n<li>"Klyp sammen to eller flere fingre, eller spre dem fra hverandre, for å justere zoomnivået"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", trykk raskt på skjermen tre ganger og hold inne fingeren på det tredje trykket.\n"<ul><li>"Dra fingeren for å bevege på skjermbildet"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snarvei for tilgjengelighet"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Slå av"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Slå på"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Fjern"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Angi som pålitelig"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vil du slå på systemets CA-sertifikat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vil du slå av systemets CA-sertifikat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vil du fjerne brukerens CA-sertifikat permanent?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillater bare"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Angi timeplan for Ikke forstyrr"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Slå av lyden på enheten til bestemte tider"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Bare prioritet"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Bare alarmer"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vil du tilbakestille tellerne av frekvensbegrensning for ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér låseskjermvarsler"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul varselinnhold"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Minst bredde"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index fa37553..6a8d999 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रिन लक छान्नुहोस्"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्यका लागि लक छनोट"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"तपाईँको फोन सुरक्षित गर्नुहोस्"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"तपाईंको फिंगरप्रिन्ट ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ। सुरक्षित हुनका लागि ब्याकअप लक स्क्रिन सेटअप गर्नुहोस्।"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"तपाईँको फिंगरप्रिन्ट बलियो ढाँचा, PIN वा पासवर्ड भन्दा कम सुरक्षित हुन सक्छ। थप सुरक्षाका लागि ब्याकअप स्क्रिन लकलाई सेट अप गर्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो ट्याब्लेट प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो यन्त्र प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो फोन प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"असक्षम गर्नुहोस्"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"सक्षम पार्नुहोस्"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"हटाउनुहोस्"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"विश्वास गर्नुहोस्"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"प्रणाली CA प्रमाणपत्र सक्षम गर्ने हो?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"प्रणाली CA प्रमाणपत्र असक्षम गर्ने हो?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"प्रयोगकर्ता CA प्रमाणपत्र स्थायी रूपमा हटाउने हो?"</string>
@@ -3040,4 +3041,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager का दर-सीमित गर्ने काउन्टरहरूलाई रिसेट गर्ने हो?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लक स्क्रिनका सूचनाहरूलाई नियन्त्रण गर्नु"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सम्बन्धी सामग्री देखाउनुहोस् वा लुकाउनुहोस्"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"सबैभन्दा सानो चौडाइ"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0474eff..5d336f2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergrendeling kiezen"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Werkvergr. kiezen"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Bescherm je telefoon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Je vingerafdruk is mogelijk minder veilig dan een sterk patroon, sterke pincode of sterk wachtwoord. Stel een back-upvergrendelingsscherm zijn voor betere beveiliging."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Je vingerafdruk is mogelijk minder veilig dan een sterk patroon, sterke pincode of sterk wachtwoord. Stel een back-upvergrendelingsscherm in voor betere beveiliging."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Uitschakelen"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Inschakelen"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Verwijderen"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Vertrouwen"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Het CA-certificaat voor het systeem inschakelen?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Het CA-certificaat voor het systeem uitschakelen?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"CA-certificaat van gebruiker permanent verwijderen?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Tellers voor frequentielimieten van ShortcutManager opnieuw instellen?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Meldingen voor vergrendelingsscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Content van meldingen weergeven of verbergen"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 8803a5a..a3b3ad6 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲੌਕ ਚੁਣੋ"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ ਲੌਕ ਚੁਣੋ"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ਆਪਣੇ ਫੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ, PIN ਜਾਂ ਪਾਸਵਰਡ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ। ਸੁਰੱਖਿਅਤ ਰਹਿਣ ਲਈ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ।"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ, PIN, ਜਾਂ ਪਾਸਵਰਡ ਤੋਂ ਘੱਟ ਸੁੱਰਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ। ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ਪਾਸਵਰਡ ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ਪੈਟਰਨ ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਵੰਨਗੀ ਵਰਤੋ"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਦਾ PIN ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਡੀਵਾਈਸ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਕੰਮ ਸਬੰਧੀ ਵੰਨਗੀ ਵਰਤੋ"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ PIN ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ਗ਼ਲਤ PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ਗ਼ਲਤ ਪਾਸਵਰਡ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ਗ਼ਲਤ ਪੈਟਰਨ"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ਅਸਮਰੱਥ ਬਣਾਓ"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ਸਮਰੱਥ ਬਣਾਓ"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ਹਟਾਓ"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ਭਰੋਸਾ ਕਰੋ"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ਕੀ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ਕੀ ਸਿਸਟਮ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ਕੀ ਉਪਭੋਗਤਾ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਥਾਈ ਤੌਰ ਤੇ ਹਟਾਉਣਾ ਹੈ?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਵਾਈਬ੍ਰੇਟ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ਕੇਵਲ ਤਰਜੀਹੀ ਦੀ ਆਗਿਆ ਹੈ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ਆਟੋਮੈਟਿਕ ਨਿਯਮ"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਮਾਂ-ਸੂਚੀ ਨੂੰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"ਨਿਸ਼ਚਿਤ ਸਮੇਂ \'ਤੇ ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਪ ਕਰਵਾਓ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ਕੇਵਲ ਤਰਜੀਹੀ"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ਕੇਵਲ ਅਲਾਰਮ"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ਕੀ ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਕਾਊਂਟਰਾਂ ਨੂੰ ਮੁੜ-ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"ਸਭ ਤੋਂ ਘੱਟ ਚੁੜਾਈ"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 517a206..a2609fe 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Wybierz blokadę pracy"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zabezpiecz telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Uwaga: rozpoznawanie linii papilarnych może być mniej bezpieczne niż skomplikowany wzór, kod PIN lub hasło. Dla większego bezpieczeństwa ustaw dodatkową blokadę ekranu."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Odcisk palca może być mniej bezpieczny niż skomplikowany wzór, kod PIN lub hasło. Dla większego bezpieczeństwa ustaw dodatkową blokadę ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Hasło zostało ustawione"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kod PIN został ustawiony"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Wzór został ustawiony"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Podaj wzór używany na urządzeniu, by kontynuować"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Podaj kod PIN używany na urządzeniu, by kontynuować"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Podaj hasło używane na urządzeniu, by kontynuować"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Podaj wzór używany w profilu do pracy, by kontynuować"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Podaj kod PIN używany w profilu do pracy, by kontynuować"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Podaj hasło używane w profilu do pracy, by kontynuować"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nieprawidłowy kod PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nieprawidłowe hasło"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nieprawidłowy wzór"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Wyłącz"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Włącz"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Usuń"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Zaufaj"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Włączyć systemowy certyfikat CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Wyłączyć systemowy certyfikat CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Trwale usunąć certyfikat CA użytkownika?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Wibracje"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tylko priorytetowe"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatyczne reguły"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Ustaw harmonogram Nie przeszkadzać"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Wyciszaj urządzenie o pewnych porach"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tylko priorytetowe"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tylko alarmy"</string>
@@ -3101,4 +3095,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Zresetować liczniki ograniczania szybkości w usłudze ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Skonfiguruj powiadomienia na ekranie blokady"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaż lub ukryj informacje w powiadomieniach"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Najmniejsza szerokość"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e01e94e..9507a74 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloq de trab."</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"A impressão digital pode ser menos segura do que um padrão, PIN ou senha fortes. Configure uma tela de bloqueio alternativa para ficar protegido."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"A impressão digital pode ser menos segura que um padrão, PIN ou senha fortes. Para aumentar a segurança, configure uma tela de bloqueio alternativa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Use o padrão do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Digite o PIN do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Digite a senha do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use seu padrão de trabalho para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Digite seu PIN de trabalho para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Digite sua senha de trabalho para continuar"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desativar"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ativar"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remover"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confiar"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ativar o certificado CA do sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Desativar o certificado CA do sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Remover permanentemente o certificado CA do usuário?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Definir programação \"Não perturbe\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silenciar dispositivo em certos momentos"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Somente prioridade"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
@@ -2922,7 +2916,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps impedidos de enviar</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps impedidos de enviar</item>
     </plurals>
-    <string name="notification_summary_none" msgid="3440195312233351409">"Todos os app têm permissão para enviar"</string>
+    <string name="notification_summary_none" msgid="3440195312233351409">"Todos os apps têm permissão para enviar"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps instalados"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 apps instalados"</string>
     <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> usados"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Redefinir contadores de limite de taxa do ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 76a340b..1f3cf1a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Selec. bloq. trabalho"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteger o telemóvel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"A impressão digital pode ser menos segura do que um padrão, um PIN ou uma palavra-passe fortes. Configure um ecrã de bloqueio de segurança como medida de proteção adicional."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"A sua impressão digital pode ser menos segura do que um padrão, um PIN ou uma palavra-passe fortes. Configure um ecrã de bloqueio de ecrã de segurança como medida de proteção adicional."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impeça terceiros de utilizar este tablet sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desativar"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ativar"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remover"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confiar"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ativar o certificado da AC do sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Desativar o certificado da AC do sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Remover permanentemente o certificado de utilizador da AC?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Pretende repor os contadores do limite de taxa do ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. do ecrã de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar conteúdo de notificações"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"A menor largura"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e01e94e..9507a74 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloq de trab."</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"A impressão digital pode ser menos segura do que um padrão, PIN ou senha fortes. Configure uma tela de bloqueio alternativa para ficar protegido."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"A impressão digital pode ser menos segura que um padrão, PIN ou senha fortes. Para aumentar a segurança, configure uma tela de bloqueio alternativa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Use o padrão do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Digite o PIN do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Digite a senha do dispositivo para continuar"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use seu padrão de trabalho para continuar"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Digite seu PIN de trabalho para continuar"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Digite sua senha de trabalho para continuar"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desativar"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ativar"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remover"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confiar"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ativar o certificado CA do sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Desativar o certificado CA do sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Remover permanentemente o certificado CA do usuário?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Definir programação \"Não perturbe\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Silenciar dispositivo em certos momentos"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Somente prioridade"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
@@ -2922,7 +2916,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps impedidos de enviar</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps impedidos de enviar</item>
     </plurals>
-    <string name="notification_summary_none" msgid="3440195312233351409">"Todos os app têm permissão para enviar"</string>
+    <string name="notification_summary_none" msgid="3440195312233351409">"Todos os apps têm permissão para enviar"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps instalados"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 apps instalados"</string>
     <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> usados"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Redefinir contadores de limite de taxa do ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 81fe10f..a316a83 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -424,7 +424,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeți blocare ecran"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Alegeți blocarea pentru serviciu"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protejați telefonul"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Este posibil ca amprenta să fie mai puțin sigură decât un model, un cod PIN sau o parolă puternică. Setați un ecran de blocare de rezervă pentru a fi în siguranță."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Este posibil ca amprenta să fie mai puțin sigură decât un model, un cod PIN sau o parolă puternică. Setați o blocare a ecranului de rezervă, pentru mai multă siguranță."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
@@ -1319,18 +1319,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parola a fost setată"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Codul PIN a fost setat"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelul a fost setat"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Pentru a continua, folosiți modelul dispozitivului"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Pentru a continua, introduceți codul PIN al dispozitivului"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Pentru a continua, introduceți parola dispozitivului"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Pentru a continua, folosiți modelul de serviciu"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Pentru a continua, introduceți codul PIN de serviciu"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Pentru a continua, introduceți parola de serviciu"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Cod PIN greșit"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parolă greșită"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Model greșit"</string>
@@ -2250,6 +2244,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Dezactivați"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activați"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminați"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"De încredere"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activați certificatul CA de sistem?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Dezactivați certificatul CA de sistem?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Eliminați definitiv certificatul de utilizator CA?"</string>
@@ -2527,8 +2522,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrează"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"„Numai cu prioritate” permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reguli automate"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Setați programul Nu deranja"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Dezactivați sunetul dispozitivului în anumite momente"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Numai cu prioritate"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Numai alarme"</string>
@@ -3074,4 +3068,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Resetați contoarele de limitare a frecvenței ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlați notificările pe ecranul de blocare"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afișați sau ascundeți conținutul notificării"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Cea mai mică lățime"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 52669cb..690028c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Раб. способ блокировки"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Защитите телефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Распознавание отпечатков пальцев дает менее надежную защиту, чем графический ключ, PIN-код или пароль. Настройте дополнительную блокировку экрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Распознавание отпечатков пальцев обеспечивает менее надежную защиту, чем графический ключ, PIN-код или пароль. Настройте дополнительную блокировку экрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль был установлен"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код был установлен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ был установлен"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Чтобы продолжить, введите графический ключ устройства"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Чтобы продолжить, введите PIN-код устройства"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Чтобы продолжить, введите пароль устройства"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Чтобы продолжить, введите графический ключ рабочего профиля"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Чтобы продолжить, введите PIN-код рабочего профиля"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Чтобы продолжить, введите пароль рабочего профиля"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неверный PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неверный пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неверный ключ"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Отключить"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Включить"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Удалить"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Доверять"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Включить сертификат ЦС системы?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Отключить сертификат ЦС системы?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Полностью удалить сертификат ЦС пользователя?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибросигнал"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Только важные"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Правила"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Задать режим \"Не беспокоить\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Настройте отключение звука"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Только важные"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Только будильник"</string>
@@ -2869,7 +2863,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Зарядка этого устройства"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Просто зарядка устройства"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Подача питания"</string>
-    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Зарядка подключенного устройства"</string>
+    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Питание другого подключенного устройства"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Передача файлов"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Передача файлов на другое устройство"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Передача фото (PTP)"</string>
@@ -3101,4 +3095,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Сбросить счетчики ограничения скорости для ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Управление уведомлениями на заблокированном экране"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Скрыть или показать содержание уведомлений"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Минимальная ширина"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 55194e5..5dd027d 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"තිර අගුල තෝරාගන්න"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"කාර්යාල අගුල තෝරන්න"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ඔබගේ දුරකථනය ආරක්ෂා කර ගන්න"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ඇඟිලි සලකුණ ප්‍රබල රටාවකට, PIN අංකයකට හෝ මුරපදයකට වඩා ආරක්ෂිත බවෙන් අඩුය. ආරක්ෂාකාරී වීමට උපස්ථ අගුලු තිරයක් පිහිටුවන්න."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට, PIN අංකයකට හෝ මුරපදයකට වඩා ආරක්ෂිත බවෙන් අඩුය. වැඩි ආරක්ෂාව සඳහා උපස්ථ අගුලු තිරයක් පිහිටුවන්න."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම ටැබ්ලට උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම දුරකථනය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
@@ -1311,18 +1311,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"මුරපදය සකස් කර ඇත."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN සකස් කර ඇත."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"රටාව සකස් කරන ලදි."</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"දිගටම කරගෙන යාමට ඔබේ උපාංග රටාව භාවිත කරන්න"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"දිගටම කරගෙන යාමට ඔබේ උපාංග PIN අංකය ඇතුළු කරන්න"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"දිගටම කරගෙන යාමට ඔබේ උපාංග මුරපදය ඇතුළු කරන්න"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"දිගටම කරගෙන යාමට ඔබේ කාර්යාල රටාව භාවිත කරන්න"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"දිගටම කරගෙන යාමට ඔබේ කාර්යාල PIN අංකය ඇතුළු කරන්න"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"දිගටම කරගෙන යාමට ඔබේ කාර්යාල මුරපදය ඇතුළු කරන්න"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN එක වැරදියි"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"වැරදි මුරපදය"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"වැරදි රටාවකි"</string>
@@ -2234,6 +2228,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"අබල කරන්න"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"සබල කරන්න"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ඉවත් කරන්න"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"විශ්වාසයි"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"පද්ධති CA සහතිකය සබල කරන්නද?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"පද්ධති CA සහතිකය අබල කරන්නද?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"පරිශීලක CA සහතික සදාකාලිකවම ඉවත් කරන්නද?"</string>
@@ -2511,8 +2506,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"කම්පනය වන්න"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ප්‍රමුඛතා පමණි ඉඩ දෙයි"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ස්වයංක්‍රීය රීති"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"බාධා නොකරන්න කාල සටහන සැකසීම"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"නිශ්චිත වේලාවලදී ඔබේ උපාංගය නිහඬ කරන්න"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ප්‍රමුඛතාව පමණයි"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"එලාම පමණයි"</string>
@@ -3047,4 +3041,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager අගය-සීමා කිරීමේ ගණන් කිරීම් යළි සකසන්නද?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"අගුලු තිර දැනුම්දීම් පාලනය කරන්න"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"දැනුම්දීම් අන්තර්ගතය පෙන්වන්න නැතහොත් සඟවන්න"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"කුඩාම පළල"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ab31ee2..f39c0b6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zámka obrazovky"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Výber pracovnej zámky"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Chráňte svoje telefón"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Odtlačok prsta môže byť menej bezpečný ako silný vzor, kód PIN alebo heslo. Zaistite svoju bezpečnosť – nastavte si záložnú uzamknutú obrazovku."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Odtlačok prsta môže byť menej bezpečný ako silný vzor, kód PIN alebo heslo. Zaistite dodatočnú bezpečnosť – nastavte si záložnú zámku obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bolo nastavené"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Bol nastavený kód PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzor bol nastavený"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Ak chcete pokračovať, použite bezpečnostný vzor zariadenia"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Ak chcete pokračovať, zadajte kód PIN zariadenia"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Ak chcete pokračovať, zadajte heslo zariadenia"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Ak chcete pokračovať, použite pracovný bezpečnostný vzor"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Ak chcete pokračovať, zadajte pracovný kód PIN"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Ak chcete pokračovať, zadajte pracovné heslo"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávny kód PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávne heslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávny vzor"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zakázať"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Povoliť"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odstrániť"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Dôverovať"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Povoliť systémový certifikát CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Zakázať systémový certifikát CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Natrvalo odstrániť používateľský certifikát CA?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrovanie"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritné"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nastaviť rozvrh režimu Nerušiť"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Stíšenie zariadenia v určitom čase"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Iba prioritné"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Iba budíky"</string>
@@ -3101,4 +3095,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Resetovať počítadlá na obmedzenie frekvencie žiadostí v službe ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ovládajte upozornenia na zamk. obrazovke"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazujte si obsah upozornení alebo ho skryte"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Minimálna šírka"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 76d6b4a..c3a1718 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zaklep zaslona"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Izbira zakl. del. p."</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaščita telefona"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Prstni odtis bo morda manj varen kot zapleten vzorec, koda PIN ali geslo. Zaradi varnosti nastavite nadomestno zaklepanje zaslona."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Prstni odtis bo morda manj varen kot zapleten vzorec, koda PIN ali geslo. Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Geslo je nastavljeno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Koda PIN je nastavljena"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzorec je nastavljen"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Če želite nadaljevati, uporabite vzorec za napravo"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Če želite nadaljevati, vnesite kodo PIN za napravo"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Če želite nadaljevati, vnesite geslo za napravo"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Če želite nadaljevati, uporabite vzorec za delovni profil"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Če želite nadaljevati, vnesite kodo PIN za delovni profil"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Če želite nadaljevati, vnesite geslo za delovni profil"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Napačna koda PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Napačno geslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Napačen vzorec"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogoči"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Omogoči"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odstrani"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Zaupaj"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Želite omogočiti sistemsko overjeno potrdilo?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Želite onemogočiti sistemsko overjeno potrdilo?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Želite trajno odstraniti uporabniško overjeno potrdilo?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"»Samo predn.« dovoljuje"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Samodejna pravila"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nastavitev urnika za »ne moti«"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Utišanje naprave ob določeni uri"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prednostno"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
@@ -3101,4 +3095,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Želite ponastaviti števce omejevanja hitrosti za ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Nadzor obvestil na zaklenjenem zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikaz ali skrivanje vsebine obvestil"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanjša širina"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index d8c50cd..f4878ce 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zgjidh kyçjen e ekranit"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Zgjidh kyçjen e punës"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Mbroje telefonin tënd"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv, një kod PIN ose një fjalëkalim i fortë. Konfiguro një ekran rezervë të kyçjes për të qenë i sigurt."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv, një kod PIN ose një fjalëkalim i fortë. Për më shumë siguri, konfiguro një kyçje rezervë të ekranit."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Parandalo që të tjerët ta përdorin këtë tablet pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Çaktivizo"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktivizo"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Hiq"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Beso"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Të aktivizohet certifikata CA e sistemit?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Të çaktivizohet certifikata CA e sistemit?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Të hiqet përgjithmonë certifikata CA e përdoruesit?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Të rivendosen matësit e kufizimit të normës së ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollo njoftimet e ekranit të kyçjes"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Shfaq ose fshih përmbajtjet e njoftimeve"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Gjerësia më e vogël"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3b47e10..61a6d9c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -424,7 +424,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закључавање екрана"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Изаберите закључавање за Work"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Заштитите телефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а или лозинке. Подесите резервни метод за закључавање екрана да бисте били безбедни."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Отисак прста може да буде мање безбедан од јаког шаблона, PIN-а или лозинке. Подесите резервни метод за закључавање екрана ради додатне безбедности."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Спречите друге да користе овај таблет без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречите друге да користе овај уређај без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречите друге да користе овај телефон без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
@@ -1319,18 +1319,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Лозинка је постављена"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN је постављен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Шаблон је постављен"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Употребите шаблон за уређај да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Унесите PIN уређаја да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Унесите лозинку уређаја да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Употребите шаблон за профил за Work да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Унесите PIN за профил за Work да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Унесите лозинку за профил за Work да бисте наставили"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Погрешан PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Погрешна лозинка"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Погрешан шаблон"</string>
@@ -2249,6 +2243,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Онемогући"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Омогући"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Уклони"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Имај поверења"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Желите ли да омогућите системски CA сертификат?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Желите ли да онемогућите системски CA сертификат?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Желите да трајно уклоните CA сертификат корисника?"</string>
@@ -2526,8 +2521,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрација"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозвољени су само приоритети"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аутоматска правила"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Подесите распоред за Не узнемиравај"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Искључите понекад звук на уређају"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Само приоритетни прекиди"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
@@ -3073,4 +3067,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Желите ли да ресетујете бројање за ограничавање броја у ShortcutManager-у?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролишите обавештења на закљ. екрану"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прегледајте или сакријте садржај обавештења"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Најмања ширина"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c3e247a..174d9b7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Välj jobblås"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Skydda mobilen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingeravtryck kan vara mindre säkra än ett starkt grafiskt lösenord, en pinkod eller ett starkt lösenord. Konfigurera en låsskärm som reservlösning för säkerhets skull."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fingeravtryck kan vara mindre säkra än ett starkt grafiskt lösenord, en pinkod eller ett starkt lösenord. Konfigurera en låsskärm som reservlösning för säkerhets skull."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindra andra från att använda surfplattan utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
@@ -661,7 +661,7 @@
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installera certifikat"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"I syfte att förbättra platsangivelserna kan systemtjänster och -appar fortfarande söka efter Wi-Fi-nätverk. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Visa inte igen"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi i viloläge"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi på i viloläge"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi på i viloläge"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Öka effektiviteten"</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lösenordet angavs"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koden angavs"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Lösenordet har angetts"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Ange det grafiska lösenordet för enheten om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Ange pinkoden för enheten om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Ange lösenordet för enheten om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Ange det grafiska lösenordet för jobbprofilen om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Ange pinkoden för jobbprofilen om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Ange lösenordet för jobbprofilen om du vill fortsätta"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Fel pinkod"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Fel lösenord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Fel grafiskt lösenord"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inaktivera"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktivera"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ta bort"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Ange som betrott"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vill du att systemets CA-certifikat ska aktiveras?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vill du att systemets CA-certifikat ska inaktiveras?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vill du att användarens CA-certifikat ska tas bort permanent?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tillåt endast prioriterade"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiska regler"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Konfigurera schema för Stör ej"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Stäng av ljudet vissa tider"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Bara prioriterade"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Endast alarm"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vill du återställa räknarna för anropsbegränsning i ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Hantera aviseringar på låsskärmen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Visa eller dölja innehåll i aviseringar"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Minsta bredd"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d84aed6..63728f7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -423,7 +423,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Mbinu ya kufunga skrini?"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Chagua mbinu ya kufunga wasifu wa kazini"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Linda simu yako"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Huenda alama ya kidole ikawa na kiwango cha chini cha usalama ikilinganishwa na mchoro au PIN dhabiti. Weka mbinu mbadala ya kufunga skrini ili uwe salama."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Huenda alama ya kidole ikawa na kiwango cha chini cha usalama ikilinganishwa na mchoro au PIN dhabiti au nenosiri. Kwa usalama zaidi, weka mbinu mbadala ya kufunga skrini."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
@@ -1315,18 +1315,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Nenosiri limewekwa"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN imewekwa"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mchoro umewekwa"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Tumia mchoro wa kufungua kifaa chako ili uendelee"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Weka PIN ya kifaa chako ili uendelee"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Weka nenosiri la kifaa chako ili uendelee"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Tumia mchoro wa kazini ili uendelee"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Weka PIN ya kazini ili uendelee"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Weka nenosiri lako ili uendelee"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nambari ya PIN si sahihi"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nenosiri si sahihi"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Mchoro wa kufungua si sahihi"</string>
@@ -2238,6 +2232,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zima"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Washa"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ondoa"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Kuaminika"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Wezesha mfumo wa cheti cha CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lemaza mfumo wa cheti cha CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Ondoa cheti cha CA cha  mtumiaji kabisa?"</string>
@@ -2515,8 +2510,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tetema"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Ruhusu kipaumbele pekee"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria za otomatiki"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Weka ratiba ya Usinisumbue"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Nyamazisha kifaa chako wakati fulani"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kipaumbele tu"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kengele pekee"</string>
@@ -3051,4 +3045,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Ungependa kuweka upya mipangilio ya vipengee vya hesabu ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Dhibiti arifa za kufunga skrini"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Onyesha au ufiche maudhui ya arifa"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"Dp <xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Upana mdogo zaidi"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index fe5b299..70b4dc0 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"திரைப் பூட்டைத் தேர்வுசெய்யவும்"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"பணிப் பூட்டைத் தேர்வுசெய்க"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ஃபோனைப் பாதுகாக்கவும்"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"உங்கள் கைரேகையானது வலுவான வடிவம், பின் அல்லது கடவுச்சொல்லை விடப் பாதுகாப்பு குறைவானதாக இருக்கக்கூடும். பாதுகாப்பாக இருக்க, மாற்றுப் பூட்டுத் திரையை அமைக்கவும்."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"உங்கள் கைரேகையானது வலுவான பேட்டர்ன், பின் அல்லது கடவுச்சொல்லை விட குறைந்த பாதுகாப்புடையதாக இருக்கக்கூடும். கூடுதல் பாதுகாப்பிற்கு, மாற்றுப் பூட்டுத் திரையை அமைக்கவும்."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்த டேப்லெட்டைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் உங்கள் ஃபோனைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"கடவுச்சொல் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"பின் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"வடிவம் அமைக்கப்பட்டது"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"தொடர, சாதனப் பேட்டர்னை வரையவும்"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"தொடர, சாதனப் பின்னை உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"தொடர, சாதனக் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"தொடர, பணிப் பேட்டர்னை வரையவும்"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"தொடர, பணிப் பின்னை உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"தொடர, பணிக் கடவுச்சொல்லை உள்ளிடவும்"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"தவறான பின்"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"தவறான கடவுச்சொல்"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"தவறான வடிவம்"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"முடக்கு"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"இயக்கு"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"அகற்று"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"நம்பகமானது"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"அமைப்பின் CA சான்றிதழை இயக்கவா?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"அமைப்பின் CA சான்றிதழை முடக்கவா?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"பயனரின் CA சான்றிதழை நிரந்தரமாக அகற்றவா?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"அதிர்வு"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"முதன்மை அனுமதிப்பவை:"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"தானியங்கு விதிகள்"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"தொந்தரவு செய்யக்கூடாத நேரம்"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"குறிப்பிட்ட நேரங்களில், சாதனத்தை நிசப்தமாக்கும்"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"முதன்மை மட்டும்"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"அலாரங்கள் மட்டும்"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager இன் மதிப்பீட்டு வரம்புக் கவுன்டர்களை மீட்டமைக்கவா?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"பூட்டு திரை அறிவிப்புகளை கட்டுப்படுத்து"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"அறிவிப்பு உள்ளடக்கத்தைக் காட்டும் அல்லது மறைக்கும்"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"மிகக் குறைந்த அகலம்"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index ab5453e..b1590c4 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"స్క్రీన్ లాక్‌ను ఎంచుకోండి"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"కార్యాలయ లాక్‌ను ఎంచుకోండి"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"మీ ఫోన్‌ను రక్షించుకోండి"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"వేలిముద్ర శక్తివంతమైన నమూనా, PIN లేదా పాస్‌వర్డ్ కంటే తక్కువ సురక్షితంగా ఉండవచ్చు. సురక్షితంగా ఉండటానికి బ్యాకప్ లాక్ స్క్రీన్‌ను సెటప్ చేయండి."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"మీ వేలిముద్ర శక్తివంతమైన నమూనా, PIN లేదా పాస్‌వర్డ్ కంటే తక్కువ సురక్షితంగా ఉండవచ్చు. అదనపు భద్రత కోసం, బ్యాకప్ స్క్రీన్ లాక్‌ను సెటప్ చేయండి."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ టాబ్లెట్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"నిలిపివేయి"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ప్రారంభించు"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"తీసివేయి"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"విశ్వసించు"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"సిస్టమ్ CA ప్రమాణపత్రాన్ని ప్రారంభించాలా?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"సిస్టమ్ CA ప్రమాణపత్రాన్ని నిలిపివేయాలా?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"వినియోగదారు CA ప్రమాణపత్రాన్ని శాశ్వతంగా తీసివేయాలా?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"సత్వరమార్గ నిర్వాహికి రేట్-పరిమిత కౌంటర్‌లను రీసెట్ చేయాలా?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"లాక్ స్క్రీన్ నోటిఫికేషన్‌లను నియంత్రించండి"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"నోటిఫికేషన్ కంటెంట్‌ను చూపు లేదా దాచు"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"అతితక్కువ వెడల్పు"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 15aed78..3f03ff8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"เลือกล็อกงาน"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ปกป้องโทรศัพท์ของคุณ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบ, PIN หรือรหัสผ่านที่เดายาก โปรดตั้งค่าล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบ, PIN หรือรหัสผ่านที่เดายาก โปรดตั้งค่าล็อกหน้าจอสำรองเพื่อให้ปลอดภัยยิ่งขึ้น"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ปิดใช้งาน"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"เปิดใช้งาน"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"นำออก"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"เชื่อถือได้"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"เปิดใช้งานระบบใบรับรอง CA หรือไม่"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ปิดใช้งานระบบใบรับรอง CA หรือไม่"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"นำใบรับรอง CA ของผู้ใช้ออกถาวรหรือไม่"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"รีเซ็ตตัวนับการจำกัดอัตราของ ShortcutManager ไหม"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ควบคุมการแจ้งเตือนบนหน้าจอล็อก"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"แสดงหรือซ่อนเนื้อหาการแจ้งเตือน"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"ความกว้างที่เล็กที่สุด"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index da8dd86..d920ec9 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Pumili, lock sa trabaho"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protektahan phone mo"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa malakas na pattern, PIN o password. Mag-set up ng backup na lock screen upang maging ligtas."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Maaaring hindi gaanong secure ang iyong fingerprint kumpara sa mahirap hulaang pattern, PIN o password. Para sa karagdagang seguridad, mag-set up ng backup na lock ng screen."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Pigilan ang ibang taong magamit ang tablet na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang lock ng screen na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang lock ng screen na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang lock ng screen na gusto mong gamitin."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"I-disable"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Alisin"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Pagkatiwalaan"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"I-enable ang CA certificate system?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"I-disable ang CA certificate system?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanenteng alisin ang CA certificate ng user?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"I-reset ang mga counter ng ShortcutManager na naglilimita ng rate?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolin ang notification sa lockscreen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ipakita o itago ang content ng notification"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> (na) dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Pinakamaliit na lapad"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5a619fa..c45b0d8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"İş kilidini seçin"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefonunuzu koruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Parmak izinizin güvenirliği, güçlü bir desene veya PIN\' göre daha düşük olabilir. Güvende olmak için bir yedek kilit ekranı ayarlayın."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Parmak iziniz güçlü bir desene, PIN\'e veya şifreye göre daha az güvenli olabilir. Daha fazla güvenlik için bir yedek ekran kilidi ayarlayın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Şifre ayarlandı"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ayarlandı"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Desen ayarlandı"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Devam etmek için cihazınızın desenini kullanın"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Devam etmek için cihazınızın PIN\'ini girin"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Devam etmek için cihazınızın şifresini girin"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Devam etmek için iş profilinizin desenini kullanın"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Devam etmek için iş profilinizin PIN\'ini girin"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Devam etmek için iş profilinizin şifresini girin"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Yanlış PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış şifre"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış desen"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Devre dışı bırak"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Etkinleştir"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Kaldır"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Güven"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Sistem CA sertifikası etkinleştirilsin mi?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Sistem CA sertifikası devre dışı bırakılsın mı?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Kullanıcı CA sertifikası kalıcı olarak kaldırılsın mı?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titreşim"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnızca öncelik şunlara izin verir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Rahatsız Etmeyin ayarını yapın"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Belirli zamanlarda cihazınızın sesini kapatın"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Yalnızca öncelikliler"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnızca alarmlar"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager hız sınırlama sayaçları sıfırlansın mı?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kilit ekranı bildirimlerini kontrol edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirim içeriğini gösterin veya gizleyin"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"En küçük genişlik"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4364070..22a019e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -427,7 +427,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокування екрана"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Вибер. спосіб розблок."</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Захистіть свій телефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Відбиток пальця може бути менш надійним, ніж ключ, PIN-код чи пароль. Налаштуйте резервне блокування екрана, щоб надійно захистити пристрій."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Відбиток пальця може бути менш надійним, ніж ключ, PIN-код чи пароль. Налаштуйте резервний спосіб блокування екрана, щоб надійніше захистити свої дані."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Активуйте функції захисту планшета, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Активуйте функції захисту пристрою, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Активуйте функції захисту телефона, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
@@ -1329,18 +1329,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль установлено"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код установлено"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ установлено"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Щоб продовжити, введіть ключ пристрою"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Щоб продовжити, введіть PIN-код пристрою"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Щоб продовжити, введіть пароль пристрою"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Щоб продовжити, введіть ключ робочого профілю"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Щоб продовжити, введіть PIN-код робочого профілю"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Щоб продовжити, введіть пароль робочого профілю"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неправильний PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неправильний пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неправильний ключ"</string>
@@ -2266,6 +2260,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Вимкнути"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Увімкнути"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Видалити"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Довіряти"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Увімкнути сертифікат ЦС для системи?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Вимкнути сертифікат ЦС для системи?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Назавжди видалити сертифікат ЦС для користувача?"</string>
@@ -2543,8 +2538,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібросигнал"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволити лише пріоритетні"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Авторежим"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Вибрати режим \"Не турбувати\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Вимикати звук пристрою в певний час"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Лише пріоритетні"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Лише будильник"</string>
@@ -3101,4 +3095,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Скинути лічильники обмеження швидкості в ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Керуйте сповіщеннями на заблок. екрані"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показуйте або приховуйте вміст сповіщень"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"Точок: <xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Найменша ширина"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index f9b8e26..e9e7b17 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -374,7 +374,7 @@
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"کوئی دوسرا شامل کریں"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"آگے جائیں"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"اپنے فون کو غیر مقفل کرنے کے علاوہ، آپ خریداریوں کی توثیق کرنے اور ایپ تک رسائی حاصل کرنے کیلئے اپنے فنگر پرنٹ کا بھی استعمال کر سکتے ہیں۔ "<annotation id="url">"مزید جانیں"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"اسکرین مقفل کا اختیار غیر فعال ہو گیا۔ مزید جاننے کیلئے اپنے ادارے کے منتظم سے رابطہ کریں۔ "<annotation id="admin_details">"مزید تفصیلات"</annotation>\n\n"آپ اب بھی خریداریوں کی اجازت دینے اور ایپ کی رسائی کیلئے انگلی کا نشان استعمال کر سکتے ہیں۔ "<annotation id="url">"مزید جانیں"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"اسکرین مقفل کا اختیار غیر فعال ہو گیا۔ مزید جاننے کیلئے اپنے ادارے کے منتظم سے رابطہ کریں۔ "<annotation id="admin_details">"مزید تفصیلات"</annotation>\n\n"آپ اب بھی خریداریوں کی اجازت دینے اور ایپ کی رسائی کیلئے فنگر پرنٹ استعمال کر سکتے ہیں۔ "<annotation id="url">"مزید جانیں"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"انگلی اٹھائیں اور سنسر کو دوبارہ ٹچ کریں"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ اپنی فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"‏اپنی ترتیبات تبدیل کرنے کیلئے، ترتیبات ‎&lt;‎ سیکیورٹی ‎&lt;‎ فنگر پرنٹ پر جائیں۔"</string>
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اسکرین لاک منتخب کریں"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"دفتری قفل منتخب کریں"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"اپنے فون کا تحفظ کریں"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"‏ایک طاقتور پیٹرن، PIN یا پاسورڈ کی نسبت فنگر پرنٹ شاید کم محفوظ ہو۔ محفوظ رہنے کیلئے ایک بیک اپ مقفل اسکرین سیٹ اپ کریں۔"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"‏ایک طاقتور پیٹرن، PIN یا پاسورڈ کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔ اضافی سیکیورٹی کیلئے ایک بیک اپ اسکرین قفل سیٹ اپ کریں۔"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ آلہ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ فون استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
@@ -443,9 +443,9 @@
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ہائی سیکیورٹی"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ابھی نہیں"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"موجودہ اسکرین لاک"</string>
-    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"انگلی کا نشان + پیٹرن"</string>
-    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"‏انگلی کا نشان + PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"انگلی کا نشان + پاسورڈ"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"فنگر پرنٹ + پیٹرن"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"‏فنگر پرنٹ + PIN"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"فنگر پرنٹ + پاسورڈ"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"منتظم، مرموز کاری کی پالیسی یا اسناد کے اسٹوریج کے ذریعے غیر فعال کردہ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"کوئی نہیں"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"سوائپ کریں"</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"غیر فعال کریں"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"فعال کریں"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ہٹائیں"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"بھروسہ"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"‏سسٹم CA سرٹیفیکیٹ کو فعال کریں؟"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"‏سسٹم CA سرٹیفیکیٹ کو غیر فعال کریں؟"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"‏صارف کا CA سرٹیفیکیٹ مستقل طور پر ہٹا دیں؟"</string>
@@ -2665,9 +2666,9 @@
     <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
     <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
     <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
     <string name="encrypt_require_pin" msgid="2063945047845243752">"‏آلہ شروع کرنے کیلئے PIN درکار ہے"</string>
     <string name="encrypt_require_pattern" msgid="6898479411004015810">"آلہ شروع کرنے کیلئے پیٹرن درکار ہے"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"آلہ شروع کرنے کیلئے پاس ورڈ درکار ہے"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏ShortcutManager کے شرح محدود بندی کاؤنٹرز ری سیٹ کریں؟"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"قفل اسکرین کی اطلاعات کنٹرول کریں"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"اطلاعی مواد دکھائیں یا چھپائیں"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"سب سے چھوٹی چوڑائی"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 72e2d10..8e5e8e2 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran qulfini tanlang"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Ishchi profil qulfini tanlang"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefoningizni himoyalang"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Barmoq izining himoya darajasi murakkab chizmali kalit, PIN kod yoki parolga qaraganda uchalik xavfsiz emas. Xavfsizlikni ta’minlash uchun zaxira ekran qulfini sozlang."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Barmoq izining himoya darajasi murakkab chizmali kalit, PIN kod yoki parolga qaraganda uchalik xavfsiz emas. Qo‘shimcha xavfsizlik uchun zaxira ekran qulfini sozlang."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu planshetdan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu qurilmadan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu telefondan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
@@ -1309,18 +1309,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parol o‘rnatildi"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kod o‘rnatildi"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Chizmali parol o‘rnatildi"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Davom etish uchun chizmali parolingizni kiriting"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Davom etish uchun qurilmangiz PIN kodini kiriting"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Davom etish uchun qurilmangiz parolini kiriting"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Davom etish uchun ishchi profilingiz chizmali kalitini kiriting"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Davom etish uchun ishchi profilingiz PIN kodini kiriting"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Davom etish uchun ishchi profilingiz parolini kiriting"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN-kod noto‘g‘ri"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parol noto‘g‘ri"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Chizmali kalit noto‘g‘ri"</string>
@@ -2232,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"O‘chirib qo‘yish"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Yoqish"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"O‘chirish"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Ishonch bildirish"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Tizimning SM sertifikati yoqilsinmi?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Tizimning SM sertifikati o‘chirib qo‘yilsinmi?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Foydalanuvchining SM sertifikati butunlay o‘chirilsinmi?"</string>
@@ -2509,8 +2504,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tebranish"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Faqat muhimlari"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qoidalar"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"“Bezovta qilinmasin” rejimi"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Ovozsiz rejimni sozlang"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Faqat muhimlari"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Faqat signallar"</string>
@@ -3045,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager uchun tezlikni cheklash hisoblagichi qaytadan boshlansinmi?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran qulfi bildirishnomalarini boshqaring"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirishnomani ko‘rsatish yoki berkitish"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Eng kichik eni"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b57194c..d92ada9 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Chọn khóa hồ sơ công việc"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Bảo vệ điện thoại của bạn"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Vân tay có thể kém an toàn hơn so với hình, mã PIN hoặc mật khẩu khó đoán. Thiết lập màn hình khóa dự phòng để đảm bảo an toàn."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Vân tay có thể kém an toàn hơn so với hình mở khóa, mã PIN hoặc mật khẩu khó đoán. Để tăng cường bảo mật, hãy thiết lập màn hình khóa dự phòng."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
@@ -2226,6 +2226,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Tắt"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Bật"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Xóa"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Độ tin cậy"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Bật chứng chỉ CA hệ thống?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Tắt chứng chỉ CA hệ thống?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Xóa vĩnh viễn chứng chỉ CA người dùng?"</string>
@@ -3038,4 +3039,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Đặt lại bộ đếm giới hạn tốc độ trong ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kiểm soát thông báo trên màn hình khóa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Hiển thị hoặc ẩn nội dung thông báo"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Độ rộng nhỏ nhất"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ae26300..b054013 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -421,7 +421,8 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"选择工作资料锁屏方式"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"为手机启用保护功能"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"指纹识别的安全性可能不及安全系数高的图案、PIN 码或密码。请设置备用屏幕锁定方式以确保安全。"</string>
+    <!-- no translation found for setup_lock_settings_picker_fingerprint_message (4384500605121098860) -->
+    <skip />
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"启用设备保护功能可防止他人在未经您允许的情况下使用此平板电脑。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"启用设备保护功能可防止他人在未经您允许的情况下使用此设备。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"启用设备保护功能可防止他人在未经您允许的情况下使用此手机。请选择您要使用的屏幕锁定方式。"</string>
@@ -826,7 +827,7 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"首选 WLAN"</item>
+    <item msgid="5782108782860004851">"首选 WLAN 网络"</item>
     <item msgid="9006785365352731433">"首选移动网络"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
@@ -1309,18 +1310,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"密码已设置"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已设置PIN码"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"图案已设置"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic (2920960858283879113) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic (4062335874438910487) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic (3976394862548354966) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pattern_generic_profile (4435638308193361861) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_pin_generic_profile (3730141667547002246) -->
-    <skip />
-    <!-- no translation found for lockpassword_confirm_your_password_generic_profile (4250642723467019894) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"请绘制您的设备解锁图案以继续"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"请输入您的设备 PIN 码以继续"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"请输入您的设备密码以继续"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"请绘制您的工作解锁图案以继续"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"请输入您的工作 PIN 码以继续"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"请输入您的工作密码以继续"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 码错误"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密码错误"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"图案错误"</string>
@@ -2232,6 +2227,8 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"停用"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"启用"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"删除"</string>
+    <!-- no translation found for trusted_credentials_trust_label (8003264222650785429) -->
+    <skip />
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"要启用该系统CA证书吗？"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"要停用该系统CA证书吗？"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"要永久移除该用户CA证书吗？"</string>
@@ -2509,8 +2506,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"振动"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许优先打扰内容"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自动规则"</string>
-    <!-- no translation found for zen_mode_automation_suggestion_title (3373871113435938830) -->
-    <skip />
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"设置“请勿打扰”时间安排"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"在特定时间将设备静音"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"仅限优先打扰"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"仅限闹钟"</string>
@@ -3045,4 +3041,14 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"要重置 ShortcutManager 调用频率限制计数器吗？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"控制锁定屏幕通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"显示或隐藏通知内容"</string>
+    <!-- no translation found for developer_density_summary (1998244213021456519) -->
+    <skip />
+    <!-- no translation found for developer_smallest_width (7516950434587313360) -->
+    <skip />
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e78b4d9..302349d 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"選擇工作設定檔鎖定方式"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"保護您的手機"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"相比高強度的上鎖圖案、PIN 或密碼，指紋識別的安全性較低。請額外設定上鎖畫面以策安全。"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"相比高強度的上鎖圖案、PIN 或密碼，指紋識別的安全性較低。請額外設定上鎖畫面以策安全。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此平板電腦。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此裝置。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此手機。請選擇您想使用的螢幕鎖定功能。"</string>
@@ -1310,12 +1310,12 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"已設定密碼"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已設定 PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"已設定圖形"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"請畫出您的裝置解鎖圖形以繼續作業"</string>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"請輸入您的裝置 PIN 碼以繼續作業"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"請輸入您的裝置密碼以繼續作業"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"請畫出您的 Work 解鎖圖形以繼續作業"</string>
-    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"請輸入您的 Work PIN 碼以繼續作業"</string>
-    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"請輸入您的 Work 密碼以繼續作業"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"畫出裝置上鎖圖案即可繼續"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"輸入裝置 PIN 碼即可繼續"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"輸入裝置密碼即可繼續"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"畫出工作設定檔上鎖圖案即可繼續"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"輸入工作設定檔 PIN 碼即可繼續"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"輸入工作設定檔密碼即可繼續"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 碼錯誤"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密碼錯誤"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"圖形錯誤"</string>
@@ -2231,6 +2231,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"停用"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"啟用"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"移除"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"信任"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"啟用系統 CA 憑證嗎？"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"停用系統 CA 憑證嗎？"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"永久移除使用者 CA 憑證嗎？"</string>
@@ -2508,7 +2509,7 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先設定只允許："</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"設定「零打擾」時間表"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"設定「請勿騷擾」日程表"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"在特定時間將裝置設為靜音"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅限優先"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅限鬧鐘"</string>
@@ -3043,4 +3044,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"要重設 ShortcutManager 的速率限制計算器嗎？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"控制上鎖畫面通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 66d74a6..a4f9ead 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"選擇 Work 鎖定方式"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"保護您的手機"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"使用複雜的圖形、PIN 碼或密碼會比感應指紋來得安全。請額外設定螢幕鎖定方式以確保安全。"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"使用複雜的圖形、PIN 碼或密碼會比感應指紋來得安全。請額外設定螢幕鎖定方式，進一步提升安全性。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這台平板電腦。請選擇您要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這個裝置。請選擇您要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這支手機。請選擇您要使用的螢幕鎖定方式。"</string>
@@ -2230,6 +2230,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"停用"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"啟用"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"移除"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"信任"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"啟用系統 CA 憑證嗎？"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"停用系統 CA 憑證嗎？"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"永久移除使用者 CA 憑證嗎？"</string>
@@ -3042,4 +3043,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"要重設 ShortcutManager 速率限制計數器嗎？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"管理螢幕鎖定通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1122714..608ebb4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -421,7 +421,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Khetha isikhiya somsebenzi"</string>
     <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Vikela ifoni yakho"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Izigxivizo zeminwe zingavikeleka kancane kunephethini eqinile, iphinikhodi noma iphasiwedi. Setha isikri"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Izigxivizo zakho zeminwe kungenzeka zivikeleke kancane kunephethini eqinile, i-PIN, noma iphasiwedi. Ngokuvikelwa okungeziwe, setha ukukhiya isikrini kokwenza isipele."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
@@ -2233,6 +2233,7 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Khubaza"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Vumela"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Susa"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Themba"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vumela isitifiketi sesistimu se-CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Khubaza isitifiketi sesistimu se-CA"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Susa ngokuphelele isitifiketi se-CA somsebenzidi?"</string>
@@ -3045,4 +3046,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Setha kabusha izibali zokukhawulela ukulinganisela kwe-ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lawula izaziso zesikrini sokukhiya"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bonisa noma fihla okuqukethwe kwesaziso"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"I-<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Ububanzi obuncane"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 34ca866..89b2d15 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -125,4 +125,6 @@
 
     <color name="seek_bar_preference_preview_text">#fff</color>
 
+    <color name="usage_graph_dots">#B0BEC5</color>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8c532f5..c11ea33 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -57,61 +57,46 @@
     <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
     <string name="header_category_system">System</string>
 
-    <!-- Phone info -->
-    <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="turn_on_radio">Turn on radio</string>
-    <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="turn_off_radio">Turn off radio</string>
-
-    <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="sms_over_ims_on">Turn on SMS over IMS</string>
-    <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="sms_over_ims_off">Turn off SMS over IMS</string>
-
-    <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="ims_reg_required_on">Turn on IMS registration required</string>
-    <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="ims_reg_required_off">Turn off IMS registration required</string>
+    <!-- Data Connection Enable. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="radio_info_data_connection_enable">Enable Data Connection</string>
+    <!-- Data Connection Disable. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="radio_info_data_connection_disable">Disable Data Connection</string>
 
     <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="volte_provisioned_flag_on">Turn on VoLTE provisioned flag</string>
-    <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="volte_provisioned_flag_off">Turn off VoLTE provisioned flag</string>
+    <string name="volte_provisioned_switch_string">VoLTE Provisioned</string>
 
-    <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="lte_ram_dump_on">Turn on lte ram dump</string>
-    <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="lte_ram_dump_off">Turn off lte ram dump</string>
+    <!-- Cell Radio Power. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="radio_info_radio_power">Cellular Radio Power</string>
 
     <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_menu_viewADN">View SIM address book</string>
+    <string name="radioInfo_menu_viewADN">View SIM Address Book</string>
     <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_menu_viewFDN">View Fixed Dialing Numbers</string>
     <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_menu_viewSDN">View Service Dialing Numbers</string>
     <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_menu_getPDP">Get PDP list</string>
+    <string name="radioInfo_menu_getPDP">Get PDP List</string>
 
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_service_in">In service</string>
+    <string name="radioInfo_service_in">In Service</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_service_out">Out of service</string>
+    <string name="radioInfo_service_out">Out of Service</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_service_emergency">Emergency calls only</string>
+    <string name="radioInfo_service_emergency">Emergency Calls Only</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_service_off">Radio off</string>
+    <string name="radioInfo_service_off">Radio Off</string>
 
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_roaming_in">Roaming</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_roaming_not">Not roaming</string>
+    <string name="radioInfo_roaming_not">Not Roaming</string>
 
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_phone_idle">Idle</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_phone_ringing">Ringing</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_phone_offhook">Call in progress</string>
+    <string name="radioInfo_phone_offhook">Call in Progress</string>
 
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_data_disconnected">Disconnected</string>
@@ -123,7 +108,7 @@
     <string name="radioInfo_data_suspended">Suspended</string>
 
     <!-- Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_unknown">unknown</string>
+    <string name="radioInfo_unknown">Unknown</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_display_packets">pkts</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -402,62 +387,57 @@
     <string name="proxy_url_title">"PAC URL: "</string>
 
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_signal_location_label">Location:</string>
+    <string name="radio_info_signal_location_label">Cell Location Info (deprecated):</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_neighboring_location_label">Neighboring CID:</string>
+    <string name="radio_info_neighboring_location_label">Neighbor Cell Info (deprecated):</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_cellinfo_label">CellInfo:</string>
+    <string name="radio_info_cell_info_refresh_rate">Cell Info Refresh Rate:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_dcrtinfo_label">DcRtInfo:</string>
+    <string name="radio_info_cellinfo_label">All Cell Measurement Info:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_data_attempts_label">Data attempts:</string>
+    <string name="radio_info_dcrtinfo_label">Data Connection Real-Time Info:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-
-    <string name="radio_info_gprs_service_label">Data Technology:</string>
+    <string name="radio_info_gprs_service_label">Data Service:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_roaming_label">Roaming:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_imei_label">IMEI:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_call_redirect_label">Call redirect:</string>
+    <string name="radio_info_call_redirect_label">Call Redirect:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_ppp_resets_label">Number of PPP reset since boot:</string>
+    <string name="radio_info_ppp_resets_label">Number of PPP Reset Since Boot:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_gsm_disconnects_label">GSM disconnects:</string>
+    <string name="radio_info_current_network_label">Current Network:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_current_network_label">Current network:</string>
+    <string name="radio_info_ppp_received_label">Data Received:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_data_successes_label">Data successes:</string>
+    <string name="radio_info_gsm_service_label">Voice Service:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_ppp_received_label">PPP received:</string>
+    <string name="radio_info_signal_strength_label">Signal Strength:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_gsm_service_label">Voice Technology:</string>
+    <string name="radio_info_call_status_label">Voice Call Status:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_signal_strength_label">Signal strength:</string>
+    <string name="radio_info_ppp_sent_label">Data Sent:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_call_status_label">Call status:</string>
+    <string name="radio_info_message_waiting_label">Message Waiting:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_ppp_sent_label">PPP sent:</string>
+    <string name="radio_info_phone_number_label">Phone Number:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_radio_resets_label">Radio resets:</string>
+    <string name="radio_info_band_mode_label">Select Radio Band</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_message_waiting_label">Message waiting:</string>
+    <string name="radio_info_voice_network_type_label">Voice Network Type:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_phone_number_label">Phone number:</string>
+    <string name="radio_info_data_network_type_label">Data Network Type:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_band_mode_label">Select radio band</string>
-    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_network_type_label">Network type:</string>
-    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_set_perferred_label">Set preferred network type:</string>
+    <string name="radio_info_set_perferred_label">Set Preferred Network Type:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_ping_hostname_v4">Ping Hostname(www.google.com) IPv4:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_ping_hostname_v6">Ping Hostname(www.google.com) IPv6:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_http_client_test">HTTP Client test:</string>
+    <string name="radio_info_http_client_test">HTTP Client Test:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="ping_test_label">Run ping test</string>
+    <string name="ping_test_label">Run Ping Test</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_smsc_label">SMSC:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -465,15 +445,15 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_smsc_refresh_label">Refresh</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_toggle_dns_check_label">Toggle DNS check</string>
+    <string name="radio_info_toggle_dns_check_label">Toggle DNS Check</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="oem_radio_info_label">OEM-specific Info/Settings</string>
 
     <!-- Band Mode Selection -->
     <!-- Band mode screen.  Title of activity. -->
-    <string name="band_mode_title">Set GSM/UMTS band</string>
+    <string name="band_mode_title">Set Radio Band Mode</string>
     <!-- Band mode screen.  Loading message. -->
-    <string name="band_mode_loading">Loading band list\u2026</string>
+    <string name="band_mode_loading">Loading Band List\u2026</string>
     <!-- Band mode screen. Button caption to set the bandmode. -->
     <string name="band_mode_set">Set</string>
     <!-- Band mode screen. Status message when unsuccessful. -->
@@ -3089,6 +3069,13 @@
     <!-- Message to be used to explain the user that he needs to enter his work password to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
+    <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+    <string name="lockpassword_strong_auth_required_reason_restart_pattern">Pattern required after device restarts</string>
+    <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+    <string name="lockpassword_strong_auth_required_reason_restart_pin">PIN required after device restarts</string>
+
+    <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+    <string name="lockpassword_strong_auth_required_reason_restart_password">Password required after device restarts</string>
 
     <!-- Security & location settings screen, change security method screen instruction if user
          enters incorrect PIN [CHAR LIMIT=30] -->
@@ -3626,8 +3613,8 @@
     <string name="virtual_keyboard_category">Virtual keyboard</string>
     <!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
     <string name="available_virtual_keyboard_category">Available virtual keyboard</string>
-    <!-- Title for the button to trigger the 'Add or edit virtual keyboards' preference sub-screen. [CHAR LIMIT=35] -->
-    <string name="add_virtual_keyboard">Add or edit virtual keyboards</string>
+    <!-- Title for the button to trigger the 'Manage keyboards' preference sub-screen, where the user can turn on/off installed virtual keyboards.[CHAR LIMIT=35] -->
+    <string name="add_virtual_keyboard">Manage keyboards</string>
     <!-- Title for the 'keyboard assistance' preference category. [CHAR LIMIT=35] -->
     <string name="keyboard_assistance_category">Keyboard assistance</string>
     <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->
@@ -3636,6 +3623,10 @@
     <string name="show_ime">Show virtual keyboard</string>
     <!-- Summary text for the 'add virtual keyboard' preference sub-screen. [CHAR LIMIT=100] -->
     <string name="show_ime_summary">Keep it on screen while physical keyboard is active</string>
+    <!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->
+    <string name="keyboard_shortcuts_helper">Keyboard shortcuts helper</string>
+    <!-- Summary text for the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=100] -->
+    <string name="keyboard_shortcuts_helper_summary">Display available shortcuts</string>
     <!--
         Format string for a physical device in the form: InputMethodSubtype - InputMethodEditor.
         e.g. English (US) - X Keyboard -->
@@ -5282,13 +5273,22 @@
     <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
     <string name="done_button">Done</string>
     <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
-    <string name="ssl_ca_cert_dialog_title">Network monitoring</string>
+    <plurals name="ssl_ca_cert_dialog_title">
+        <item quantity="one">Trust or remove certificate</item>
+        <item quantity="other">Trust or remove certificates</item>
+    </plurals>
     <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
-    <string name="ssl_ca_cert_info_message">This device is managed by:\n<xliff:g id="managing_domain">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator.</string>
+    <plurals name="ssl_ca_cert_info_message">
+        <item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
+        <item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
+    </plurals>
     <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
     <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string>
     <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
-    <string name="ssl_ca_cert_settings_button">Check trusted credentials</string>
+    <plurals name="ssl_ca_cert_settings_button">
+        <item quantity="one">Check certificate</item>
+        <item quantity="other">Check certificates</item>
+    </plurals>
 
     <!-- User settings -->
     <skip/>
@@ -7343,6 +7343,10 @@
     <string name="notification_log_details_default">default</string>
     <!-- Notification log debug tool: the word 'none' -->
     <string name="notification_log_details_none">none</string>
+    <!-- Notification log debug tool: missing ranking information -->
+    <string name="notification_log_details_ranking_null">Ranking object is missing.</string>
+    <!-- Notification log debug tool: the word 'none' -->
+    <string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
 
     <!-- [CHAR_LIMIT=60] Label for special access screen -->
     <string name="special_access">Special access</string>
@@ -7361,7 +7365,7 @@
     <!-- Message of the dialog box to confirm resetting rate-limiting in the system service ShortcutManager. [CHAR_LIMIT=none] -->
     <string name="confirm_reset_shortcut_manager_throttling_message">Reset ShortcutManager rate-limiting counters?</string>
 
-    <!-- Title of notification suggestion during optional steps of setup. [CHAR_LIMIT=40] -->
+    <!-- Title of notification suggestion during optional steps of setup. [CHAR_LIMIT=60] -->
     <string name="notification_suggestion_title">Control lock screen notifications</string>
     <!-- Summary of notification suggestion during optional steps of setup. [CHAR_LIMIT=80] -->
     <string name="notification_suggestion_summary">Show or hide notification content</string>
@@ -7372,4 +7376,19 @@
     <!-- Title of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
     <string name="developer_smallest_width">Smallest width</string>
 
+    <!-- Message shown when there are no premium SMS apps [CHAR LIMIT=NONE] -->
+    <string name="premium_sms_none">No installed apps have requested Premium SMS access</string>
+
+    <!-- Warning message shown between options to enable Premium SMS for an app [CHAR LIMIT=NONE] -->
+    <string name="premium_sms_warning">Premium SMS may cost you money and will add up to your carrier bills. If you enable permission for an app, you will be able to send premium SMS using that app.</string>
+
+    <!-- Title of screen controlling which apps have access to send premium SMS messages [CHAR LIMIT=60] -->
+    <string name="premium_sms_access">Premium SMS access</string>
+
+    <!-- [CHAR LIMIT=25] Bluetooth is disabled. -->
+    <string name="bluetooth_disabled">Disabled</string>
+
+    <!-- [CHAR LIMIT=60] Name of dev option called demo mode -->
+    <string name="demo_mode">Demo mode</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 45d2c11..0eb566c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -357,6 +357,11 @@
         <item name="android:textColor">@color/warning</item>
     </style>
 
+    <style name="TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
+        parent="android:TextAppearance.Material.Body1">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
     <style name="TextAppearance.Small.SwitchBar">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textStyle">normal</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c85a4f1..427e11f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -198,8 +198,8 @@
     </style>
 
     <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
-        <item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
+        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
+        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
         <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
     </style>
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 7e8d2be..e737ba8 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -91,6 +91,12 @@
         android:key="ota_disable_automatic_update"
         android:title="@string/ota_disable_automatic_update" />
 
+    <PreferenceScreen
+        android:key="demo_mode"
+        android:title="@string/demo_mode">
+        <intent android:action="com.android.settings.action.DEMO_MODE" />
+    </PreferenceScreen>
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
@@ -323,12 +329,6 @@
             android:entries="@array/track_frame_time_entries"
             android:entryValues="@array/track_frame_time_values" />
 
-        <ListPreference
-            android:key="enable_opengl_traces"
-            android:title="@string/enable_opengl_traces_title"
-            android:entries="@array/enable_opengl_traces_entries"
-            android:entryValues="@array/enable_opengl_traces_values" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_applications_category"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index c19f8d9..54b17d3 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -41,11 +41,12 @@
             android:entries="@array/night_mode_entries"
             android:entryValues="@array/night_mode_values" /> -->
 
-        <PreferenceScreen
+        <com.android.settingslib.RestrictedPreference
                 android:key="wallpaper"
                 android:title="@string/wallpaper_settings_title"
                 settings:keywords="@string/keywords_display_wallpaper"
-                android:fragment="com.android.settings.WallpaperTypeSettings" />
+                android:fragment="com.android.settings.WallpaperTypeSettings"
+                settings:useAdminDisabledSummary="true" />
 
         <com.android.settings.TimeoutListPreference
                 android:key="screen_timeout"
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 9fd0826..1abf9be 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -34,7 +34,7 @@
             android:enabled="false"
             android:selectable="true" />
 
-        <PreferenceCategory
+        <com.android.settings.DividedCategory
             android:key="recent_location_requests"
             android:title="@string/location_category_recent_location_requests" />
 
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index 97a06ea..6984f88 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -17,6 +17,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="manage_assist">
 
     <com.android.settings.applications.DefaultAssistPreference
@@ -40,8 +41,9 @@
             android:title="@string/voice_input_settings_title"
             />
 
-    <Preference
+    <com.android.settings.DividerPreference
         android:summary="@string/assist_footer"
-        android:selectable="false"/>
+        android:selectable="false"
+        settings:allowDividerAbove="true" />
 
 </PreferenceScreen>
diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml
index 4de2672..974ba98 100644
--- a/res/xml/physical_keyboard_settings.xml
+++ b/res/xml/physical_keyboard_settings.xml
@@ -25,5 +25,10 @@
             android:title="@string/show_ime"
             android:summary="@string/show_ime_summary"
             android:defaultValue="false" />
+
+        <Preference
+            android:key="keyboard_shortcuts_helper"
+            android:title="@string/keyboard_shortcuts_helper"
+            android:summary="@string/keyboard_shortcuts_helper_summary" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index 3a45697..7b6069d 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -43,4 +43,8 @@
             android:title="@string/unlock_set_unlock_password_title"
             android:persistent="false"/>
 
+    <com.android.settingslib.RestrictedPreference
+            android:key="unlock_set_managed"
+            android:persistent="false"/>
+
 </PreferenceScreen>
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 5adf20c..31789fb 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -74,6 +74,11 @@
         android:fragment="com.android.settings.notification.NotificationAccessSettings" />
 
     <PreferenceScreen
+        android:key="premium_sms"
+        android:title="@string/premium_sms_access"
+        android:fragment="com.android.settings.applications.PremiumSmsAccess" />
+
+    <PreferenceScreen
         android:key="data_saver"
         android:title="@string/unrestricted_data_saver"
         android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 71a81dd..3aeb83e 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -15,6 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/wifi_configure_titlebar">
 
     <Preference
@@ -40,10 +41,11 @@
         android:summary="@string/wifi_automatically_connect_summary"
         android:dialogTitle="@string/wifi_select_assistant_dialog_title" />
 
-    <Preference
+    <com.android.settings.DividerPreference
         android:key="mac_address"
         android:title="@string/wifi_advanced_mac_address_title"
-        android:layout="@layout/wifi_advance_layout" />
+        android:layout="@layout/wifi_advance_layout"
+        settings:allowDividerAbove="true" />
 
     <Preference
         android:key="current_ip_address"
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 5eb17b2..1182ed5 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -27,6 +27,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.UserInfo;
 import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
@@ -50,6 +51,8 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
 
+import java.util.List;
+
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 public class ChooseLockGeneric extends SettingsActivity {
@@ -89,6 +92,7 @@
         private static final String KEY_UNLOCK_SET_PIN = "unlock_set_pin";
         private static final String KEY_UNLOCK_SET_PASSWORD = "unlock_set_password";
         private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";
+        private static final String KEY_UNLOCK_SET_MANAGED = "unlock_set_managed";
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
@@ -117,25 +121,7 @@
         private FingerprintManager mFingerprintManager;
         private int mUserId;
         private boolean mHideDrawer = false;
-        private RemovalCallback mRemovalCallback = new RemovalCallback() {
-
-            @Override
-            public void onRemovalSucceeded(Fingerprint fingerprint) {
-                Log.v(TAG, "Fingerprint removed: " + fingerprint.getFingerId());
-                if (mFingerprintManager.getEnrolledFingerprints().size() == 0) {
-                    finish();
-                }
-            }
-
-            @Override
-            public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
-                }
-                finish();
-            }
-        };
+        private ManagedLockPasswordProvider mManagedPasswordProvider;
 
         protected boolean mForFingerprint = false;
 
@@ -197,6 +183,8 @@
                 mUserId = targetUser;
             }
 
+            mManagedPasswordProvider = ManagedLockPasswordProvider.get(getActivity(), mUserId);
+
             if (mPasswordConfirmed) {
                 updatePreferencesOrFinish();
                 if (mForChangeCredRequiredForBoot) {
@@ -206,7 +194,11 @@
             } else if (!mWaitingForConfirmation) {
                 ChooseLockSettingsHelper helper =
                         new ChooseLockSettingsHelper(this.getActivity(), this);
-                if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
+                boolean managedProfileWithUnifiedLock = Utils
+                        .isManagedProfile(UserManager.get(getActivity()), mUserId)
+                        && !mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
+                if (managedProfileWithUnifiedLock
+                        || !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
                         getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm
                     updatePreferencesOrFinish();
@@ -368,6 +360,13 @@
                 Preference password = findPreference(KEY_UNLOCK_SET_PASSWORD);
                 password.setTitle(R.string.fingerprint_unlock_set_unlock_password);
             }
+
+            if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) {
+                Preference managed = findPreference(KEY_UNLOCK_SET_MANAGED);
+                managed.setTitle(mManagedPasswordProvider.getPickerOptionTitle(mForFingerprint));
+            } else {
+                removePreference(KEY_UNLOCK_SET_MANAGED);
+            }
         }
 
         private void updateCurrentPreference() {
@@ -392,7 +391,10 @@
                     return KEY_UNLOCK_SET_PIN;
                 case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
                 case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
                     return KEY_UNLOCK_SET_PASSWORD;
+                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                    return KEY_UNLOCK_SET_MANAGED;
                 case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
                     return KEY_UNLOCK_SET_NONE;
             }
@@ -474,6 +476,11 @@
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
                         disabledByAdmin = adminEnforcedQuality
                                 > DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
+                    } else if (KEY_UNLOCK_SET_MANAGED.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_MANAGED
+                                && mManagedPasswordProvider.isManagedPasswordChoosable();
+                        disabledByAdmin = adminEnforcedQuality
+                                > DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
                     }
                     if (hideDisabled) {
                         visible = enabled;
@@ -520,13 +527,18 @@
                 switch (preference.getKey()) {
                     case KEY_UNLOCK_SET_PATTERN:
                     case KEY_UNLOCK_SET_PIN:
-                    case KEY_UNLOCK_SET_PASSWORD: {
+                    case KEY_UNLOCK_SET_PASSWORD:
+                    case KEY_UNLOCK_SET_MANAGED: {
                         preference.setSummary(summary);
                     } break;
                 }
             }
         }
 
+        protected Intent getLockManagedPasswordIntent(boolean requirePassword, String password) {
+            return mManagedPasswordProvider.createIntent(requirePassword, password);
+        }
+
         protected Intent getLockPasswordIntent(Context context, int quality,
                 int minLength, final int maxLength,
                 boolean requirePasswordToDecrypt, boolean confirmCredentials, int userId) {
@@ -592,20 +604,22 @@
             }
 
             if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
-                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true);
+                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true, mUserPassword);
                 mChooseLockSettingsHelper.utils().clearLock(mUserId);
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
-                removeAllFingerprintTemplatesAndFinish();
+                removeAllFingerprintForUserAndFinish(mUserId);
                 getActivity().setResult(Activity.RESULT_OK);
             } else {
-                removeAllFingerprintTemplatesAndFinish();
+                removeAllFingerprintForUserAndFinish(mUserId);
             }
         }
 
         private Intent getIntentForUnlockMethod(int quality, boolean disabled) {
             Intent intent = null;
             final Context context = getActivity();
-            if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
+            if (quality >= DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
+                intent = getLockManagedPasswordIntent(mRequirePassword, mUserPassword);
+            } else if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null, mUserId);
                 if (minLength < MIN_PASSWORD_LENGTH) {
                     minLength = MIN_PASSWORD_LENGTH;
@@ -633,24 +647,27 @@
             return intent;
         }
 
-        private void removeAllFingerprintTemplatesAndFinish() {
+        private void removeAllFingerprintForUserAndFinish(final int userId) {
             if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
-                    && mFingerprintManager.hasEnrolledFingerprints(mUserId)) {
-                mFingerprintManager.setActiveUser(mUserId);
+                    && mFingerprintManager.hasEnrolledFingerprints(userId)) {
+                mFingerprintManager.setActiveUser(userId);
                 mFingerprintManager.remove(
-                        new Fingerprint(null, mUserId, 0, 0), mUserId,
+                        new Fingerprint(null, userId, 0, 0), userId,
                         new RemovalCallback() {
                             @Override
                             public void onRemovalError(Fingerprint fp, int errMsgId,
                                     CharSequence errString) {
-                                mRemovalCallback.onRemovalError(fp, errMsgId, errString);
-                                mFingerprintManager.setActiveUser(UserHandle.myUserId());
+                                Log.v(TAG, "Fingerprint removed: " + fp.getFingerId());
+                                if (fp.getFingerId() == 0) {
+                                    removeManagedProfileFingerprintsAndFinishIfNecessary(userId);
+                                }
                             }
 
                             @Override
                             public void onRemovalSucceeded(Fingerprint fingerprint) {
-                                mRemovalCallback.onRemovalSucceeded(fingerprint);
-                                mFingerprintManager.setActiveUser(UserHandle.myUserId());
+                                if (fingerprint.getFingerId() == 0) {
+                                    removeManagedProfileFingerprintsAndFinishIfNecessary(userId);
+                                }
                             }
                         });
             } else {
@@ -662,6 +679,29 @@
             }
         }
 
+        private void removeManagedProfileFingerprintsAndFinishIfNecessary(final int parentUserId) {
+            mFingerprintManager.setActiveUser(UserHandle.myUserId());
+            final UserManager um = UserManager.get(getActivity());
+            boolean hasChildProfile = false;
+            if (!um.getUserInfo(parentUserId).isManagedProfile()) {
+                // Current user is primary profile, remove work profile fingerprints if necessary
+                final List<UserInfo> profiles = um.getProfiles(parentUserId);
+                final int profilesSize = profiles.size();
+                for (int i = 0; i < profilesSize; i++) {
+                    final UserInfo userInfo = profiles.get(i);
+                    if (userInfo.isManagedProfile() && !mLockPatternUtils
+                            .isSeparateProfileChallengeEnabled(userInfo.id)) {
+                        removeAllFingerprintForUserAndFinish(userInfo.id);
+                        hasChildProfile = true;
+                        break;
+                    }
+                }
+            }
+            if (!hasChildProfile) {
+                finish();
+            }
+        }
+
         @Override
         public void onDestroy() {
             super.onDestroy();
@@ -707,6 +747,7 @@
                 case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
                 case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
                 case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
                     if (hasFingerprints && isProfile) {
                         return R.string
                                 .unlock_disable_frp_warning_content_password_fingerprint_profile;
@@ -745,6 +786,8 @@
             } else if (KEY_UNLOCK_SET_NONE.equals(unlockMethod)) {
                 updateUnlockMethodAndFinish(
                         DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false /* disabled */ );
+            } else if (KEY_UNLOCK_SET_MANAGED.equals(unlockMethod)) {
+                maybeEnableEncryption(DevicePolicyManager.PASSWORD_QUALITY_MANAGED, false);
             } else if (KEY_UNLOCK_SET_PATTERN.equals(unlockMethod)) {
                 maybeEnableEncryption(
                         DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index d3bf747..ec7aa33 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -22,6 +22,7 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.content.IntentSender;
+import android.os.UserManager;
 
 import com.android.internal.widget.LockPatternUtils;
 
@@ -171,7 +172,8 @@
     private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
             @Nullable CharSequence header, @Nullable CharSequence description,
             boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int effectiveUserId) {
+            long challenge, int userId) {
+        final int effectiveUserId = UserManager.get(mActivity).getCredentialOwnerProfile(userId);
         boolean launched = false;
 
         switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(effectiveUserId)) {
@@ -180,18 +182,19 @@
                         returnCredentials || hasChallenge
                                 ? ConfirmLockPattern.InternalActivity.class
                                 : ConfirmLockPattern.class, external,
-                                hasChallenge, challenge, effectiveUserId);
+                                hasChallenge, challenge, userId);
                 break;
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
                 launched = launchConfirmationActivity(request, title, header, description,
                         returnCredentials || hasChallenge
                                 ? ConfirmLockPassword.InternalActivity.class
                                 : ConfirmLockPassword.class, external,
-                                hasChallenge, challenge, effectiveUserId);
+                                hasChallenge, challenge, userId);
                 break;
         }
         return launched;
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index cf0403c..0572bcf 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -66,12 +66,15 @@
             PACKAGE + ".ConfirmCredentials.showWhenLocked";
 
     private FingerprintUiHelper mFingerprintHelper;
+    private boolean mIsStrongAuthRequired;
     private boolean mAllowFpAuthentication;
     protected Button mCancelButton;
     protected ImageView mFingerprintIcon;
     protected int mEffectiveUserId;
+    protected int mUserId;
     protected LockPatternUtils mLockPatternUtils;
     protected TextView mErrorTextView;
+    protected TextView mStrongAuthRequiredTextView;
     protected final Handler mHandler = new Handler();
 
     @Override
@@ -81,8 +84,12 @@
                 ALLOW_FP_AUTHENTICATION, false);
         // Only take this argument into account if it belongs to the current profile.
         Intent intent = getActivity().getIntent();
-        mEffectiveUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
-        mAllowFpAuthentication = mAllowFpAuthentication && !isFingerprintDisabledByAdmin();
+        mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
+        final UserManager userManager = UserManager.get(getActivity());
+        mEffectiveUserId = userManager.getCredentialOwnerProfile(mUserId);
+        mIsStrongAuthRequired = isStrongAuthRequired();
+        mAllowFpAuthentication = mAllowFpAuthentication && !isFingerprintDisabledByAdmin()
+                && !mIsStrongAuthRequired;
         mLockPatternUtils = new LockPatternUtils(getActivity());
     }
 
@@ -90,6 +97,11 @@
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mCancelButton = (Button) view.findViewById(R.id.cancelButton);
+        if (mStrongAuthRequiredTextView != null) {
+            // INIVISIBLE instead of GONE because it also acts as a weighted spacer
+            mStrongAuthRequiredTextView.setVisibility(
+                    mIsStrongAuthRequired ? View.VISIBLE : View.INVISIBLE);
+        }
         mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon);
         mFingerprintHelper = new FingerprintUiHelper(
                 mFingerprintIcon,
@@ -120,6 +132,10 @@
         return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
     }
 
+    private boolean isStrongAuthRequired() {
+        return !(UserManager.get(getContext()).isUserUnlocked(mEffectiveUserId));
+    }
+
     @Override
     public void onResume() {
         super.onResume();
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index c69bb89..ca4be6c 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -121,7 +121,20 @@
             mErrorTextView = (TextView) view.findViewById(R.id.errorText);
             mIsAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality
-                    || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality;
+                    || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality
+                    || DevicePolicyManager.PASSWORD_QUALITY_MANAGED == storedQuality;
+
+            // Strong auth is required when the user is locked.
+            // Currently a user does not get locked again until the device restarts. Show the
+            // hint text as "device has just been restarted".
+            mStrongAuthRequiredTextView = (TextView) view.findViewById(R.id.strongAuthRequiredText);
+            if (mIsAlpha) {
+                mStrongAuthRequiredTextView.setText(
+                        R.string.lockpassword_strong_auth_required_reason_restart_password);
+            } else {
+                mStrongAuthRequiredTextView.setText(
+                        R.string.lockpassword_strong_auth_required_reason_restart_pin);
+            }
 
             mImm = (InputMethodManager) getActivity().getSystemService(
                     Context.INPUT_METHOD_SERVICE);
@@ -332,11 +345,8 @@
             long challenge = getActivity().getIntent().getLongExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
             final int localEffectiveUserId = mEffectiveUserId;
-            mPendingLockCheck = LockPatternChecker.verifyPassword(
-                    mLockPatternUtils,
-                    pin,
-                    challenge,
-                    localEffectiveUserId,
+            final int localUserId = mUserId;
+            final LockPatternChecker.OnVerifyCallback onVerifyCallback =
                     new LockPatternChecker.OnVerifyCallback() {
                         @Override
                         public void onVerified(byte[] token, int timeoutMs) {
@@ -349,9 +359,15 @@
                                         token);
                             }
                             mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                    localEffectiveUserId);
+                                    localUserId);
                         }
-                    });
+            };
+            mPendingLockCheck = (localEffectiveUserId == localUserId)
+                    ? LockPatternChecker.verifyPassword(
+                            mLockPatternUtils, pin, challenge, localUserId, onVerifyCallback)
+                    : LockPatternChecker.verifyTiedProfileChallenge(
+                            mLockPatternUtils, pin, false, challenge, localUserId,
+                            onVerifyCallback);
         }
 
         private void startCheckPassword(final String pin, final Intent intent) {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index dbe9ebe..875fcb7 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -118,6 +118,7 @@
             mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
             mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
+            mStrongAuthRequiredTextView = (TextView) view.findViewById(R.id.strongAuthRequiredText);
             mErrorTextView = (TextView) view.findViewById(R.id.errorText);
             mLeftSpacerLandscape = view.findViewById(R.id.leftSpacer);
             mRightSpacerLandscape = view.findViewById(R.id.rightSpacer);
@@ -176,6 +177,12 @@
                         FRAGMENT_TAG_CHECK_LOCK_RESULT).commit();
             }
 
+            // Strong auth is required when the user is locked.
+            // Currently a user does not get locked again until the device restarts. Show the
+            // hint text as "device has just been restarted".
+            mStrongAuthRequiredTextView.setText(
+                    R.string.lockpassword_strong_auth_required_reason_restart_pattern);
+
             return view;
         }
 
@@ -420,28 +427,32 @@
             private void startVerifyPattern(final List<LockPatternView.Cell> pattern,
                     final Intent intent) {
                 final int localEffectiveUserId = mEffectiveUserId;
+                final int localUserId = mUserId;
                 long challenge = getActivity().getIntent().getLongExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
-                mPendingLockCheck = LockPatternChecker.verifyPattern(
-                        mLockPatternUtils,
-                        pattern,
-                        challenge,
-                        localEffectiveUserId,
-                        new LockPatternChecker.OnVerifyCallback() {
-                            @Override
-                            public void onVerified(byte[] token, int timeoutMs) {
-                                mPendingLockCheck = null;
-                                boolean matched = false;
-                                if (token != null) {
-                                    matched = true;
-                                    intent.putExtra(
-                                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                            token);
-                                }
-                                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                        localEffectiveUserId);
+                final LockPatternChecker.OnVerifyCallback onVerifyCallback =
+                    new LockPatternChecker.OnVerifyCallback() {
+                        @Override
+                        public void onVerified(byte[] token, int timeoutMs) {
+                            mPendingLockCheck = null;
+                            boolean matched = false;
+                            if (token != null) {
+                                matched = true;
+                                intent.putExtra(
+                                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                                        token);
                             }
-                        });
+                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                    localEffectiveUserId);
+                        }
+                    };
+                mPendingLockCheck = (localEffectiveUserId == localUserId)
+                        ? LockPatternChecker.verifyPattern(
+                                mLockPatternUtils, pattern, challenge, localUserId,
+                                onVerifyCallback)
+                        : LockPatternChecker.verifyTiedProfileChallenge(
+                                mLockPatternUtils, LockPatternUtils.patternToString(pattern),
+                                true, challenge, localUserId, onVerifyCallback);
             }
 
             private void startCheckPattern(final List<LockPatternView.Cell> pattern,
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 9d001b4..6cdf0b9 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -208,9 +208,9 @@
      * Returns true if the currently set key guard matches our minimum quality requirements.
      */
     private boolean checkKeyGuardQuality() {
-        UserInfo parent = UserManager.get(this).getProfileParent(UserHandle.myUserId());
-        int quality = new LockPatternUtils(this).getActivePasswordQuality(
-                parent != null ? parent.id : UserHandle.myUserId());
+        int credentialOwner =
+                UserManager.get(this).getCredentialOwnerProfile(UserHandle.myUserId());
+        int quality = new LockPatternUtils(this).getActivePasswordQuality(credentialOwner);
         return (quality >= MIN_PASSWORD_QUALITY);
     }
 
@@ -344,13 +344,12 @@
 
             // Clear all the users credentials could have been installed in for this user.
             final UserManager um = (UserManager) getSystemService(USER_SERVICE);
-            for (UserInfo pi : um.getProfiles(UserHandle.getUserId(Process.myUid()))) {
+            for (int userId : um.getProfileIdsWithDisabled(UserHandle.myUserId())) {
                 for (int uid : SYSTEM_CREDENTIAL_UIDS) {
-                    mKeyStore.clearUid(UserHandle.getUid(pi.id, uid));
+                    mKeyStore.clearUid(UserHandle.getUid(userId, uid));
                 }
             }
 
-
             try {
                 KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);
                 try {
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c007891..1551bcf 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -186,8 +186,6 @@
 
     private static final String INACTIVE_APPS_KEY = "inactive_apps";
 
-    private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
-
     private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
             = "immediately_destroy_activities";
     private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
@@ -278,7 +276,6 @@
     private ListPreference mTransitionAnimationScale;
     private ListPreference mAnimatorDurationScale;
     private ListPreference mOverlayDisplayDevices;
-    private ListPreference mOpenGLTraces;
 
     private SwitchPreference mWebViewMultiprocess;
     private ListPreference mWebViewProvider;
@@ -432,7 +429,6 @@
         mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
         mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
         mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
-        mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
         mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
         mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
         mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);
@@ -566,7 +562,7 @@
             return;
         }
 
-        if (mDpm.getMaximumTimeToLock(null) > 0) {
+        if (mDpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId()) > 0) {
             // A DeviceAdmin has specified a maximum time until the device
             // will lock...  in this case we can't allow the user to turn
             // on "stay awake when plugged in" because that would defeat the
@@ -680,7 +676,6 @@
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
-        updateOpenGLTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
@@ -1640,30 +1635,6 @@
         updateOverlayDisplayDevicesOptions();
     }
 
-    private void updateOpenGLTracesOptions() {
-        String value = SystemProperties.get(OPENGL_TRACES_PROPERTY);
-        if (value == null) {
-            value = "";
-        }
-
-        CharSequence[] values = mOpenGLTraces.getEntryValues();
-        for (int i = 0; i < values.length; i++) {
-            if (value.contentEquals(values[i])) {
-                mOpenGLTraces.setValueIndex(i);
-                mOpenGLTraces.setSummary(mOpenGLTraces.getEntries()[i]);
-                return;
-            }
-        }
-        mOpenGLTraces.setValueIndex(0);
-        mOpenGLTraces.setSummary(mOpenGLTraces.getEntries()[0]);
-    }
-
-    private void writeOpenGLTracesOptions(Object newValue) {
-        SystemProperties.set(OPENGL_TRACES_PROPERTY, newValue == null ? "" : newValue.toString());
-        pokeSystemProperties();
-        updateOpenGLTracesOptions();
-    }
-
     private void updateAppProcessLimitOptions() {
         try {
             int limit = ActivityManagerNative.getDefault().getProcessLimit();
@@ -1995,9 +1966,6 @@
         } else if (preference == mOverlayDisplayDevices) {
             writeOverlayDisplayDevicesOptions(newValue);
             return true;
-        } else if (preference == mOpenGLTraces) {
-            writeOpenGLTracesOptions(newValue);
-            return true;
         } else if (preference == mTrackFrameTime) {
             writeTrackFrameTimeOptions(newValue);
             return true;
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 69ffcb1..95b2879 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -30,6 +30,8 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
@@ -48,6 +50,7 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedPreference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -128,10 +131,6 @@
             removePreference(KEY_AUTO_BRIGHTNESS);
         }
 
-        if (!isWallpaperSettingAllowed(activity)) {
-            grayPreferenceOut(KEY_WALLPAPER);
-        }
-
         if (isLiftToWakeAvailable(activity)) {
             mLiftToWakePreference = (SwitchPreference) findPreference(KEY_LIFT_TO_WAKE);
             mLiftToWakePreference.setOnPreferenceChangeListener(this);
@@ -223,10 +222,6 @@
                 com.android.internal.R.bool.config_allowAllRotations);
     }
 
-    private static boolean isWallpaperSettingAllowed(Context context) {
-        return WallpaperManager.getInstance(context).isWallpaperSettingAllowed();
-    }
-
     private static boolean isLiftToWakeAvailable(Context context) {
         SensorManager sensors = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
         return sensors != null && sensors.getDefaultSensor(Sensor.TYPE_WAKE_GESTURE) != null;
@@ -302,10 +297,13 @@
         if (dpm != null) {
             final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(
                     getActivity());
-            final long maxTimeout = dpm.getMaximumTimeToLock(null);
+            final long maxTimeout = dpm
+                    .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
             mScreenTimeoutPreference.removeUnusableTimeouts(maxTimeout, admin);
         }
         updateTimeoutPreferenceDescription(currentTimeout);
+
+        disablePreferenceIfManaged(KEY_WALLPAPER, UserManager.DISALLOW_SET_WALLPAPER);
     }
 
     private void updateState() {
@@ -427,10 +425,16 @@
         return R.string.help_uri_display;
     }
 
-    private void grayPreferenceOut(String key) {
-        Preference pref = findPreference(key);
+    private void disablePreferenceIfManaged(String key, String restriction) {
+        final RestrictedPreference pref = (RestrictedPreference) findPreference(key);
         if (pref != null) {
-            pref.setEnabled(false);
+            pref.setDisabledByAdmin(null);
+            if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(), restriction,
+                    UserHandle.myUserId())) {
+                pref.setEnabled(false);
+            } else {
+                pref.checkRestrictionAndSetDisabled(restriction);
+            }
         }
     }
 
diff --git a/src/com/android/settings/DividerPreference.java b/src/com/android/settings/DividerPreference.java
index e9ff7a7..d499e52 100644
--- a/src/com/android/settings/DividerPreference.java
+++ b/src/com/android/settings/DividerPreference.java
@@ -36,6 +36,20 @@
         }
     }
 
+    public DividerPreference(Context context) {
+        this(context, null);
+    }
+
+    public void setDividerAllowedAbove(boolean allowed) {
+        mAllowAbove = allowed;
+        notifyChanged();
+    }
+
+    public void setDividerAllowedBelow(boolean allowed) {
+        mAllowBelow = allowed;
+        notifyChanged();
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
deleted file mode 100644
index 3c36edb..0000000
--- a/src/com/android/settings/HelpUtils.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2012 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;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources.Theme;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-
-import java.net.URISyntaxException;
-import java.util.Locale;
-
-/**
- * Functions to easily prepare contextual help menu option items with an intent that opens up the
- * browser to a particular URL, while taking into account the preferred language and app version.
- */
-public class HelpUtils {
-    private final static String TAG = HelpUtils.class.getSimpleName();
-
-    private static final int MENU_HELP = Menu.FIRST + 100;
-
-    /**
-     * Help URL query parameter key for the preferred language.
-     */
-    private final static String PARAM_LANGUAGE_CODE = "hl";
-
-    /**
-     * Help URL query parameter key for the app version.
-     */
-    private final static String PARAM_VERSION = "version";
-
-    // Constants for help intents.
-    private static final String EXTRA_CONTEXT = "EXTRA_CONTEXT";
-    private static final String EXTRA_THEME = "EXTRA_THEME";
-    private static final String EXTRA_PRIMARY_COLOR = "EXTRA_PRIMARY_COLOR";
-    private static final String EXTRA_BACKUP_URI = "EXTRA_BACKUP_URI";
-
-    /**
-     * Cached version code to prevent repeated calls to the package manager.
-     */
-    private static String sCachedVersionCode = null;
-
-    /** Static helper that is not instantiable*/
-    private HelpUtils() { }
-
-    public static boolean prepareHelpMenuItem(Activity activity, Menu menu, String helpUri,
-            String backupContext) {
-        MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
-        return prepareHelpMenuItem(activity, helpItem, helpUri, backupContext);
-    }
-
-    public static boolean prepareHelpMenuItem(Activity activity, Menu menu, int helpUriResource,
-            String backupContext) {
-        MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
-        return prepareHelpMenuItem(activity, helpItem, activity.getString(helpUriResource),
-                backupContext);
-    }
-
-    /**
-     * Prepares the help menu item by doing the following.
-     * - If the helpUrlString is empty or null, the help menu item is made invisible.
-     * - Otherwise, this makes the help menu item visible and sets the intent for the help menu
-     *   item to view the URL.
-     *
-     * @return returns whether the help menu item has been made visible.
-     */
-    public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem,
-            String helpUriString, String backupContext) {
-        if (TextUtils.isEmpty(helpUriString)) {
-            // The help url string is empty or null, so set the help menu item to be invisible.
-            helpMenuItem.setVisible(false);
-
-            // return that the help menu item is not visible (i.e. false)
-            return false;
-        } else {
-            final Intent intent = getHelpIntent(activity, helpUriString, backupContext);
-
-            // Set the intent to the help menu item, show the help menu item in the overflow
-            // menu, and make it visible.
-            if (intent != null) {
-                helpMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        activity.startActivityForResult(intent, 0);
-                        return true;
-                    }
-                });
-                helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-                helpMenuItem.setVisible(true);
-            } else {
-                helpMenuItem.setVisible(false);
-                return false;
-            }
-
-            // return that the help menu item is visible (i.e., true)
-            return true;
-        }
-    }
-
-    public static Intent getHelpIntent(Context context, String helpUriString,
-            String backupContext) {
-        // Try to handle as Intent Uri, otherwise just treat as Uri.
-        try {
-            Intent intent = Intent.parseUri(helpUriString,
-                    Intent.URI_ANDROID_APP_SCHEME | Intent.URI_INTENT_SCHEME);
-            addIntentParameters(context, intent, backupContext);
-            ComponentName component = intent.resolveActivity(context.getPackageManager());
-            if (component != null) {
-                return intent;
-            } else if (intent.hasExtra(EXTRA_BACKUP_URI)) {
-                // This extra contains a backup URI for when the intent isn't available.
-                return getHelpIntent(context, intent.getStringExtra(EXTRA_BACKUP_URI),
-                        backupContext);
-            } else {
-                return null;
-            }
-        } catch (URISyntaxException e) {
-        }
-        // The help url string exists, so first add in some extra query parameters.
-        final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUriString));
-
-        // Then, create an intent that will be fired when the user
-        // selects this help menu item.
-        Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-        return intent;
-    }
-
-    private static void addIntentParameters(Context context, Intent intent, String backupContext) {
-        if (!intent.hasExtra(EXTRA_CONTEXT)) {
-            // Insert some context if none exists.
-            intent.putExtra(EXTRA_CONTEXT, backupContext);
-        }
-        intent.putExtra(EXTRA_THEME, 1 /* Light, dark action bar */);
-        Theme theme = context.getTheme();
-        TypedValue typedValue = new TypedValue();
-        theme.resolveAttribute(android.R.attr.colorPrimary, typedValue, true);
-        intent.putExtra(EXTRA_PRIMARY_COLOR, context.getColor(typedValue.resourceId));
-    }
-
-    /**
-     * Adds two query parameters into the Uri, namely the language code and the version code
-     * of the app's package as gotten via the context.
-     * @return the uri with added query parameters
-     */
-    public static Uri uriWithAddedParameters(Context context, Uri baseUri) {
-        Uri.Builder builder = baseUri.buildUpon();
-
-        // Add in the preferred language
-        builder.appendQueryParameter(PARAM_LANGUAGE_CODE, Locale.getDefault().toString());
-
-        // Add in the package version code
-        if (sCachedVersionCode == null) {
-            // There is no cached version code, so try to get it from the package manager.
-            try {
-                // cache the version code
-                PackageInfo info = context.getPackageManager().getPackageInfo(
-                        context.getPackageName(), 0);
-                sCachedVersionCode = Integer.toString(info.versionCode);
-
-                // append the version code to the uri
-                builder.appendQueryParameter(PARAM_VERSION, sCachedVersionCode);
-            } catch (NameNotFoundException e) {
-                // Cannot find the package name, so don't add in the version parameter
-                // This shouldn't happen.
-                Log.wtf(TAG, "Invalid package name for context", e);
-            }
-        } else {
-            builder.appendQueryParameter(PARAM_VERSION, sCachedVersionCode);
-        }
-
-        // Build the full uri and return it
-        return builder.build();
-    }
-}
diff --git a/src/com/android/settings/ManagedLockPasswordProvider.java b/src/com/android/settings/ManagedLockPasswordProvider.java
new file mode 100644
index 0000000..b9725d7
--- /dev/null
+++ b/src/com/android/settings/ManagedLockPasswordProvider.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Helper for handling managed passwords in security settings UI.
+ * It provides resources that should be shown in settings UI when lock password quality is set to
+ * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED} and hooks for implementing
+ * an option for setting the password quality to
+ * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
+ */
+public class ManagedLockPasswordProvider {
+    /** Factory method to make it easier to inject extended ManagedLockPasswordProviders. */
+    static ManagedLockPasswordProvider get(Context context, int userId) {
+        return new ManagedLockPasswordProvider();
+    }
+
+    protected ManagedLockPasswordProvider() {}
+
+    /**
+     * Whether choosing/setting a managed lock password is supported for the user.
+     * Please update {@link #getPickerOptionTitle(boolean)} if overridden to return true.
+     */
+    boolean isSettingManagedPasswordSupported() { return false; }
+
+    /**
+     * Whether the user should be able to choose managed lock password.
+     */
+    boolean isManagedPasswordChoosable() { return false; }
+
+    /**
+     * Returns title for managed password preference in security (lock) setting picker.
+     * Should be overridden if {@link #isManagedPasswordSupported()} returns true.
+     * @param forFingerprint Whether fingerprint unlock is enabled.
+     */
+    String getPickerOptionTitle(boolean forFingerprint) { return ""; }
+
+    /**
+     * Gets resource id of the lock screen preference that should be displayed in security settings
+     * if the current password quality is set to
+     * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
+     * @param forProfile Whether the settings are shown for a user profile rather than a user.
+     */
+    int getResIdForLockUnlockScreen(boolean forProfile) {
+        return forProfile ? R.xml.security_settings_password_profile
+                : R.xml.security_settings_password;
+    }
+
+    /**
+     * Gets resource id of the subscreen that should be shown after clicking gear icon for lock
+     * screen preference in security settings if the current password quality is set to
+     * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
+     */
+    int getResIdForLockUnlockSubScreen() {
+        return R.xml.security_settings_password_sub;
+    }
+
+    /**
+     * Creates intent that should be launched when user chooses managed password in the lock
+     * settings picker.
+     * @param requirePasswordToDecrypt Whether a password is needed to decrypt the user.
+     * @param password Current lock password.
+     * @return Intent that should update lock password to a managed password.
+     */
+    Intent createIntent(boolean requirePasswordToDecrypt, String password) {
+        return null;
+    }
+}
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index 9dd83f5..cfa8e6f 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -18,78 +18,65 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.RemoteException;
-import android.view.WindowManager;
-import android.view.WindowManagerGlobal;
+import android.os.UserHandle;
+import android.provider.Settings;
 
 /**
  * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
- * traffic.
+ * traffic. This activity should be launched for the user into which the CA cert is installed.
  */
-public class MonitoringCertInfoActivity extends Activity implements OnClickListener {
-
-    private boolean hasDeviceOwner = false;
+public class MonitoringCertInfoActivity extends Activity implements OnClickListener,
+        OnDismissListener {
 
     @Override
     protected void onCreate(Bundle savedStates) {
         super.onCreate(savedStates);
 
-        DevicePolicyManager dpm =
-                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+        DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
+        final int numberOfCertificates = getIntent().getIntExtra(
+                Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.ssl_ca_cert_dialog_title);
+        builder.setTitle(getResources().getQuantityText(R.plurals.ssl_ca_cert_dialog_title,
+                numberOfCertificates));
         builder.setCancelable(true);
-        // TODO See b/25772443
-        hasDeviceOwner = dpm.getDeviceOwnerComponentOnCallingUser() != null;
-        int buttonLabel;
-        if (hasDeviceOwner) {
-            // Institutional case.  Show informational message.
-            String message = this.getResources().getString(R.string.ssl_ca_cert_info_message,
-                    dpm.getDeviceOwnerNameOnAnyUser());
-            builder.setMessage(message);
-            buttonLabel = R.string.done_button;
-        } else {
+        builder.setPositiveButton(getResources().getQuantityText(
+                R.plurals.ssl_ca_cert_settings_button, numberOfCertificates) , this);
+        builder.setNeutralButton(R.string.cancel, null);
+        builder.setOnDismissListener(this);
+
+        if (dpm.getProfileOwner() != null) {
+            builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
+                    numberOfCertificates, dpm.getProfileOwnerName()));
+        } else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
+            builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
+                    numberOfCertificates, dpm.getDeviceOwnerNameOnAnyUser()));
+        } else  {
             // Consumer case.  Show scary warning.
             builder.setIcon(android.R.drawable.stat_notify_error);
             builder.setMessage(R.string.ssl_ca_cert_warning_message);
-            buttonLabel = R.string.ssl_ca_cert_settings_button;
         }
 
-        builder.setPositiveButton(buttonLabel, this);
-
-        final Dialog dialog = builder.create();
-        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
-        try {
-            WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
-        } catch (RemoteException e) {
-        }
-        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override public void onCancel(DialogInterface dialog) {
-                finish();
-            }
-        });
-
-        dialog.show();
+        builder.show();
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        if (hasDeviceOwner) {
-            finish();
-        } else {
-            Intent intent =
-                    new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            startActivity(intent);
-            finish();
-        }
+        Intent intent = new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.putExtra(TrustedCredentialsSettings.ARG_SHOW_NEW_FOR_USER, UserHandle.myUserId());
+        startActivity(intent);
+        finish();
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialogInterface) {
+        finish();
     }
 }
diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java
index 485ac8f..20d1761 100644
--- a/src/com/android/settings/PreviewPagerAdapter.java
+++ b/src/com/android/settings/PreviewPagerAdapter.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings;
 
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.support.v4.view.PagerAdapter;
@@ -34,8 +36,6 @@
  */
 public class PreviewPagerAdapter extends PagerAdapter {
 
-    private FrameLayout[] mPreviewFrames;
-
     /** Duration to use when cross-fading between previews. */
     private static final long CROSS_FADE_DURATION_MS = 400;
 
@@ -45,6 +45,12 @@
     /** Interpolator to use when cross-fading between previews. */
     private static final Interpolator FADE_OUT_INTERPOLATOR = new AccelerateInterpolator();
 
+    private final FrameLayout[] mPreviewFrames;
+
+    private Runnable mAnimationEndAction;
+
+    private int mAnimationCounter;
+
     public PreviewPagerAdapter(Context context, int[] previewSampleResIds,
                                Configuration[] configurations) {
         mPreviewFrames = new FrameLayout[previewSampleResIds.length];
@@ -54,9 +60,6 @@
             mPreviewFrames[i].setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
                     LinearLayout.LayoutParams.MATCH_PARENT));
-            mPreviewFrames[i].setContentDescription(
-                    context.getString(R.string.preview_page_indicator_content_description, i + 1,
-                            previewSampleResIds.length));
 
             for (Configuration configuration : configurations) {
                 // Create a new configuration for the specified value. It won't
@@ -95,6 +98,14 @@
         return (view == object);
     }
 
+    boolean isAnimating() {
+        return mAnimationCounter > 0;
+    }
+
+    void setAnimationEndAction(Runnable action) {
+        mAnimationEndAction = action;
+    }
+
     void setPreviewLayer(int newIndex, int currentIndex, int currentItem, boolean animate) {
         for (FrameLayout previewFrame : mPreviewFrames) {
             if (currentIndex >= 0) {
@@ -104,6 +115,7 @@
                             .alpha(0)
                             .setInterpolator(FADE_OUT_INTERPOLATOR)
                             .setDuration(CROSS_FADE_DURATION_MS)
+                            .setListener(new PreviewFrameAnimatorListener())
                             .withEndAction(new Runnable() {
                                 @Override
                                 public void run() {
@@ -122,6 +134,7 @@
                         .alpha(1)
                         .setInterpolator(FADE_IN_INTERPOLATOR)
                         .setDuration(CROSS_FADE_DURATION_MS)
+                        .setListener(new PreviewFrameAnimatorListener())
                         .withStartAction(new Runnable() {
                             @Override
                             public void run() {
@@ -134,4 +147,34 @@
             }
         }
     }
+
+    private void runAnimationEndAction() {
+        if (mAnimationEndAction != null && !isAnimating()) {
+            mAnimationEndAction.run();
+            mAnimationEndAction = null;
+        }
+    }
+
+    private class PreviewFrameAnimatorListener implements AnimatorListener {
+        @Override
+        public void onAnimationStart(Animator animation) {
+            mAnimationCounter++;
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            mAnimationCounter--;
+            runAnimationEndAction();
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            // Empty method.
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+            // Empty method.
+        }
+    }
 }
diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
index bac146d..aa663cf 100644
--- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
+++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
@@ -79,7 +79,16 @@
 
         @Override
         public void onStopTrackingTouch(SeekBar seekBar) {
-            commit();
+            if (mPreviewPagerAdapter.isAnimating()) {
+                mPreviewPagerAdapter.setAnimationEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        commit();
+                    }
+                });
+            } else {
+                commit();
+            }
             mSeekByTouch = false;
         }
     }
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 7ed70c7..031a1ae 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -46,8 +46,10 @@
 import android.telephony.CellSignalStrengthWcdma;
 import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.NeighboringCellInfo;
+import android.telephony.PreciseCallState;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
@@ -60,8 +62,11 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.Spinner;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.ims.ImsConfig;
@@ -70,7 +75,6 @@
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
-import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.RILConstants;
 import com.android.internal.telephony.TelephonyProperties;
 
@@ -82,11 +86,60 @@
 import java.util.List;
 
 public class RadioInfo extends Activity {
-    private final String TAG = "phone";
+    private static final String TAG = "RadioInfo";
 
-    private static final int EVENT_PHONE_STATE_CHANGED = 100;
-    private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
-    private static final int EVENT_SERVICE_STATE_CHANGED = 300;
+    private static final String[] mPreferredNetworkLabels = {
+            "WCDMA preferred",
+            "GSM only",
+            "WCDMA only",
+            "GSM auto (PRL)",
+            "CDMA auto (PRL)",
+            "CDMA only",
+            "EvDo only",
+            "Global auto (PRL)",
+            "LTE/CDMA auto (PRL)",
+            "LTE/UMTS auto (PRL)",
+            "LTE/CDMA/UMTS auto (PRL)",
+            "LTE only",
+            "LTE/WCDMA",
+            "TD-SCDMA only",
+            "TD-SCDMA/WCDMA",
+            "LTE/TD-SCDMA",
+            "TD-SCDMA/GSM",
+            "TD-SCDMA/UMTS",
+            "LTE/TD-SCDMA/WCDMA",
+            "LTE/TD-SCDMA/UMTS",
+            "TD-SCDMA/CDMA/UMTS",
+            "Global/TD-SCDMA",
+            "Unknown"
+    };
+
+
+    private static final int CELL_INFO_LIST_RATE_DISABLED = Integer.MAX_VALUE;
+    private static final int CELL_INFO_LIST_RATE_MAX = 0;
+
+    //Values in must match mCellInfoRefreshRates
+    private static final String[] mCellInfoRefreshRateLabels = {
+            "Disabled",
+            "Immediate",
+            "Min 5s",
+            "Min 10s",
+            "Min 60s"
+    };
+
+    //Values in seconds, must match mCellInfoRefreshRateLabels
+    private static final int mCellInfoRefreshRates[] = {
+        CELL_INFO_LIST_RATE_DISABLED,
+        CELL_INFO_LIST_RATE_MAX,
+        5000,
+        10000,
+        60000
+    };
+
+    private void log(String s) {
+        Log.d(TAG, s);
+    }
+
     private static final int EVENT_CFI_CHANGED = 302;
 
     private static final int EVENT_QUERY_PREFERRED_TYPE_DONE = 1000;
@@ -101,9 +154,6 @@
     private static final int MENU_ITEM_GET_PDP_LIST = 4;
     private static final int MENU_ITEM_TOGGLE_DATA  = 5;
 
-    static final String ENABLE_DATA_STR = "Enable data connection";
-    static final String DISABLE_DATA_STR = "Disable data connection";
-
     private TextView mDeviceId; //DeviceId is the IMEI in GSM and the MEID in CDMA
     private TextView number;
     private TextView callState;
@@ -111,7 +161,8 @@
     private TextView roamingState;
     private TextView gsmState;
     private TextView gprsState;
-    private TextView network;
+    private TextView voiceNetwork;
+    private TextView dataNetwork;
     private TextView dBm;
     private TextView mMwi;
     private TextView mCfi;
@@ -119,11 +170,6 @@
     private TextView mNeighboringCids;
     private TextView mCellInfo;
     private TextView mDcRtInfoTv;
-    private TextView resets;
-    private TextView attempts;
-    private TextView successes;
-    private TextView disconnects;
-    private TextView sentSinceReceived;
     private TextView sent;
     private TextView received;
     private TextView mPingHostnameV4;
@@ -131,19 +177,20 @@
     private TextView mHttpClientTest;
     private TextView dnsCheckState;
     private EditText smsc;
-    private Button radioPowerButton;
-    private Button cellInfoListRateButton;
+    private Switch radioPowerOnSwitch;
+    private Button cellInfoRefreshRateButton;
     private Button dnsCheckToggleButton;
     private Button pingTestButton;
     private Button updateSmscButton;
     private Button refreshSmscButton;
     private Button oemInfoButton;
+    private Switch imsVoLteProvisionedSwitch;
     private Spinner preferredNetworkType;
+    private Spinner cellInfoRefreshRateSpinner;
 
     private TelephonyManager mTelephonyManager;
     private ImsManager mImsManager = null;
     private Phone phone = null;
-    private PhoneStateIntentReceiver mPhoneStateReceiver;
 
     private String mPingHostnameResultV4;
     private String mPingHostnameResultV6;
@@ -156,13 +203,12 @@
     private List<NeighboringCellInfo> mNeighboringCellResult = null;
 
     private int mPreferredNetworkTypeResult;
+    private int mCellInfoRefreshRateIndex;
 
-    private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
         public void onDataConnectionStateChanged(int state) {
             updateDataState();
-            updateDataStats();
-            updatePdpList();
             updateNetworkType();
         }
 
@@ -172,6 +218,17 @@
         }
 
         @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            updateNetworkType();
+            updatePhoneState(state);
+        }
+
+        @Override
+        public void onPreciseCallStateChanged(PreciseCallState preciseState) {
+            updateNetworkType();
+        }
+
+        @Override
         public void onCellLocationChanged(CellLocation location) {
             updateLocation(location);
         }
@@ -200,6 +257,21 @@
             log("onDataConnectionRealTimeInfoChanged: dcRtInfo=" + dcRtInfo);
             updateDcRtInfoTv(dcRtInfo);
         }
+
+        @Override
+        public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+            log("onSignalStrengthChanged: SignalStrength=" +signalStrength);
+            updateSignalStrength(signalStrength);
+        }
+
+        @Override
+        public void onServiceStateChanged(ServiceState serviceState) {
+            log("onServiceStateChanged: ServiceState=" + serviceState);
+            updateServiceState(serviceState);
+            updateRadioPowerState();
+            updateNetworkType();
+            updateImsVoLteProvisionedState();
+        }
     };
 
     private void updatePreferredNetworkType(int type) {
@@ -218,20 +290,6 @@
         public void handleMessage(Message msg) {
             AsyncResult ar;
             switch (msg.what) {
-                case EVENT_PHONE_STATE_CHANGED:
-                    updatePhoneState();
-                    break;
-
-                case EVENT_SIGNAL_STRENGTH_CHANGED:
-                    updateSignalStrength();
-                    break;
-
-                case EVENT_SERVICE_STATE_CHANGED:
-                    updateServiceState();
-                    updatePowerState();
-                    updateImsVoLteProvisionedState();
-                    break;
-
                 case EVENT_QUERY_PREFERRED_TYPE_DONE:
                     ar= (AsyncResult) msg.obj;
                     if (ar.exception == null && ar.result != null) {
@@ -244,7 +302,7 @@
                 case EVENT_SET_PREFERRED_TYPE_DONE:
                     ar= (AsyncResult) msg.obj;
                     if (ar.exception != null) {
-                        log("Set preferred network type success.");
+                        log("Set preferred network type failed.");
                     }
                     break;
                 case EVENT_QUERY_SMSC_DONE:
@@ -293,7 +351,8 @@
         roamingState = (TextView) findViewById(R.id.roaming);
         gsmState = (TextView) findViewById(R.id.gsm);
         gprsState = (TextView) findViewById(R.id.gprs);
-        network = (TextView) findViewById(R.id.network);
+        voiceNetwork = (TextView) findViewById(R.id.voice_network);
+        dataNetwork = (TextView) findViewById(R.id.data_network);
         dBm = (TextView) findViewById(R.id.dbm);
         mMwi = (TextView) findViewById(R.id.mwi);
         mCfi = (TextView) findViewById(R.id.cfi);
@@ -303,11 +362,6 @@
         mCellInfo.setTypeface(Typeface.MONOSPACE);
         mDcRtInfoTv = (TextView) findViewById(R.id.dcrtinfo);
 
-        resets = (TextView) findViewById(R.id.resets);
-        attempts = (TextView) findViewById(R.id.attempts);
-        successes = (TextView) findViewById(R.id.successes);
-        disconnects = (TextView) findViewById(R.id.disconnects);
-        sentSinceReceived = (TextView) findViewById(R.id.sentSinceReceived);
         sent = (TextView) findViewById(R.id.sent);
         received = (TextView) findViewById(R.id.received);
         smsc = (EditText) findViewById(R.id.smsc);
@@ -321,25 +375,16 @@
                 android.R.layout.simple_spinner_item, mPreferredNetworkLabels);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         preferredNetworkType.setAdapter(adapter);
-        preferredNetworkType.setOnItemSelectedListener(mPreferredNetworkHandler);
 
-        radioPowerButton = (Button) findViewById(R.id.radio_power);
-        radioPowerButton.setOnClickListener(mPowerButtonHandler);
+        cellInfoRefreshRateSpinner = (Spinner) findViewById(R.id.cell_info_rate_select);
+        ArrayAdapter<String> cellInfoAdapter = new ArrayAdapter<String>(this,
+                android.R.layout.simple_spinner_item, mCellInfoRefreshRateLabels);
+        cellInfoAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        cellInfoRefreshRateSpinner.setAdapter(cellInfoAdapter);
 
-        cellInfoListRateButton = (Button) findViewById(R.id.cell_info_list_rate);
-        cellInfoListRateButton.setOnClickListener(mCellInfoListRateHandler);
+        imsVoLteProvisionedSwitch = (Switch) findViewById(R.id.volte_provisioned_switch);
 
-        imsRegRequiredButton = (Button) findViewById(R.id.ims_reg_required);
-        imsRegRequiredButton.setOnClickListener(mImsRegRequiredHandler);
-
-        imsVoLteProvisionedButton = (Button) findViewById(R.id.volte_provisioned_flag);
-        imsVoLteProvisionedButton.setOnClickListener(mImsVoLteProvisionedHandler);
-
-        smsOverImsButton = (Button) findViewById(R.id.sms_over_ims);
-        smsOverImsButton.setOnClickListener(mSmsOverImsHandler);
-
-        lteRamDumpButton = (Button) findViewById(R.id.lte_ram_dump);
-        lteRamDumpButton.setOnClickListener(mLteRamDumpHandler);
+        radioPowerOnSwitch = (Switch) findViewById(R.id.radio_power);
 
         pingTestButton = (Button) findViewById(R.id.ping_test);
         pingTestButton.setOnClickListener(mPingButtonHandler);
@@ -359,11 +404,7 @@
             oemInfoButton.setEnabled(false);
         }
 
-        mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
-        mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
-        mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
-        mPhoneStateReceiver.notifyPhoneCallState(EVENT_PHONE_STATE_CHANGED);
-
+        mCellInfoRefreshRateIndex = 0; //disabled
         mPreferredNetworkTypeResult = mPreferredNetworkLabels.length - 1; //Unknown
 
         //FIXME: Replace with TelephonyManager call
@@ -379,22 +420,15 @@
 
         log("Started onResume");
 
-        updatePhoneState();
-        updateSignalStrength();
         updateMessageWaiting();
         updateCallRedirect();
-        updateServiceState();
         updateDataState();
-        updateDataStats();
         updateDataStats2();
-        updatePowerState();
-        updateCellInfoListRate();
-        updateImsRegRequiredState();
+        updateRadioPowerState();
         updateImsVoLteProvisionedState();
-        updateSmsOverImsState();
-        updateLteRamDumpState();
         updateProperties();
         updateDnsCheckState();
+        updateNetworkType();
 
         updateNeighboringCids(mNeighboringCellResult);
         updateLocation(mCellLocationResult);
@@ -404,15 +438,32 @@
         mPingHostnameV6.setText(mPingHostnameResultV6);
         mHttpClientTest.setText(mHttpClientTestResult);
 
-        mPhoneStateReceiver.registerIntent();
+        cellInfoRefreshRateSpinner.setOnItemSelectedListener(mCellInfoRefreshRateHandler);
+        //set selection after registering listener to force update
+        cellInfoRefreshRateSpinner.setSelection(mCellInfoRefreshRateIndex);
+
+        //set selection before registering to prevent update
+        preferredNetworkType.setSelection(mPreferredNetworkTypeResult, true);
+        preferredNetworkType.setOnItemSelectedListener(mPreferredNetworkHandler);
+
+        radioPowerOnSwitch.setOnCheckedChangeListener(mRadioPowerOnChangeListener);
+        imsVoLteProvisionedSwitch.setOnCheckedChangeListener(mImsVoLteCheckedChangeListener);
+
         mTelephonyManager.listen(mPhoneStateListener,
-                  PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
+                  PhoneStateListener.LISTEN_CALL_STATE
+        //b/27803938 - RadioInfo currently cannot read PRECISE_CALL_STATE
+        //      | PhoneStateListener.LISTEN_PRECISE_CALL_STATE
+                | PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
                 | PhoneStateListener.LISTEN_DATA_ACTIVITY
                 | PhoneStateListener.LISTEN_CELL_LOCATION
                 | PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR
                 | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR
                 | PhoneStateListener.LISTEN_CELL_INFO
+                | PhoneStateListener.LISTEN_SERVICE_STATE
+                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
                 | PhoneStateListener.LISTEN_DATA_CONNECTION_REAL_TIME_INFO);
+
+        smsc.clearFocus();
     }
 
     @Override
@@ -421,8 +472,8 @@
 
         log("onPause: unregister phone & data intents");
 
-        mPhoneStateReceiver.unregisterIntent();
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        phone.setCellInfoListRate(CELL_INFO_LIST_RATE_DISABLED);
     }
 
     private void restoreFromBundle(Bundle b) {
@@ -438,7 +489,10 @@
         mPingHostnameV6.setText(mPingHostnameResultV6);
         mHttpClientTest.setText(mHttpClientTestResult);
 
-        mPreferredNetworkTypeResult = b.getInt("mPreferredNetworkTypeResult", 0);
+        mPreferredNetworkTypeResult = b.getInt("mPreferredNetworkTypeResult",
+                                               mPreferredNetworkLabels.length - 1);
+
+        mCellInfoRefreshRateIndex = b.getInt("mCellInfoRefreshRateIndex", 0);
     }
 
     @Override
@@ -446,7 +500,10 @@
         outState.putString("mPingHostnameResultV4", mPingHostnameResultV4);
         outState.putString("mPingHostnameResultV6", mPingHostnameResultV6);
         outState.putString("mHttpClientTestResult", mHttpClientTestResult);
+
         outState.putInt("mPreferredNetworkTypeResult", mPreferredNetworkTypeResult);
+        outState.putInt("mCellInfoRefreshRateIndex", mCellInfoRefreshRateIndex);
+
     }
 
     @Override
@@ -463,7 +520,7 @@
         menu.add(1, MENU_ITEM_GET_PDP_LIST,
                 0, R.string.radioInfo_menu_getPDP).setOnMenuItemClickListener(mGetPdpList);
         menu.add(1, MENU_ITEM_TOGGLE_DATA,
-                0, DISABLE_DATA_STR).setOnMenuItemClickListener(mToggleData);
+                0, R.string.radio_info_data_connection_disable).setOnMenuItemClickListener(mToggleData);
         return true;
     }
 
@@ -477,10 +534,10 @@
         switch (state) {
             case TelephonyManager.DATA_CONNECTED:
             case TelephonyManager.DATA_SUSPENDED:
-                item.setTitle(DISABLE_DATA_STR);
+                item.setTitle(R.string.radio_info_data_connection_disable);
                 break;
             case TelephonyManager.DATA_DISCONNECTED:
-                item.setTitle(ENABLE_DATA_STR);
+                item.setTitle(R.string.radio_info_data_connection_enable);
                 break;
             default:
                 visible = false;
@@ -490,35 +547,6 @@
         return true;
     }
 
-    private boolean isRadioOn() {
-        //FIXME: Replace with a TelephonyManager call
-        return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
-    }
-
-    private void updatePowerState() {
-        String buttonText = isRadioOn() ?
-                            getString(R.string.turn_off_radio) :
-                            getString(R.string.turn_on_radio);
-        radioPowerButton.setText(buttonText);
-    }
-
-    private void updateCellInfoListRate() {
-        int rate = mCellInfoListRateHandler.getRate();
-        String rateStr;
-        switch(rate) {
-            case Integer.MAX_VALUE:
-                rateStr = "Off";
-                break;
-            case 0:
-                rateStr = "Immediate";
-                break;
-            default:
-                rateStr = (new Integer(rate)).toString() + "ms";
-                break;
-        }
-        cellInfoListRateButton.setText("CellInfoListRate "+ rateStr);
-    }
-
     private void updateDnsCheckState() {
         //FIXME: Replace with a TelephonyManager call
         dnsCheckState.setText(phone.isDnsCheckDisabled() ?
@@ -526,22 +554,12 @@
     }
 
     private final void
-    updateSignalStrength() {
-        // TODO PhoneStateIntentReceiver is deprecated and PhoneStateListener
-        // should probably used instead.
-        int state = mPhoneStateReceiver.getServiceState().getState();
+    updateSignalStrength(SignalStrength signalStrength) {
         Resources r = getResources();
 
-        if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
-                (ServiceState.STATE_POWER_OFF == state)) {
-            dBm.setText("0");
-        }
+        int signalDbm = signalStrength.getDbm();
 
-        int signalDbm = mPhoneStateReceiver.getSignalStrengthDbm();
-
-        if (-1 == signalDbm) signalDbm = 0;
-
-        int signalAsu = mPhoneStateReceiver.getSignalStrengthLevelAsu();
+        int signalAsu = signalStrength.getAsuLevel();
 
         if (-1 == signalAsu) signalAsu = 0;
 
@@ -635,15 +653,14 @@
         CellIdentityGsm cidGsm = ci.getCellIdentity();
         CellSignalStrengthGsm ssGsm = ci.getCellSignalStrength();
 
-        return String.format("%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-4.4s %-4.4s\n",
+        return String.format("%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-6.6s %-4.4s %-4.4s\n",
                 ci.isRegistered() ? "S  " : "   ",
                 getCellInfoDisplayString(cidGsm.getMcc()),
                 getCellInfoDisplayString(cidGsm.getMnc()),
                 getCellInfoDisplayString(cidGsm.getLac()),
                 getCellInfoDisplayString(cidGsm.getCid()),
-                // TODO: Add BSIC support once integrated
-                // getCellInfoDisplayString(cidGsm.getBsic()),
-                "    ",
+                getCellInfoDisplayString(cidGsm.getArfcn()),
+                getCellInfoDisplayString(cidGsm.getBsic()),
                 getCellInfoDisplayString(ssGsm.getDbm()));
     }
 
@@ -652,13 +669,14 @@
         CellSignalStrengthLte ssLte = ci.getCellSignalStrength();
 
         return String.format(
-                "%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-3.3s %-4.4s %-4.4s %-2.2s\n",
+                "%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-3.3s %-6.6s %-4.4s %-4.4s %-2.2s\n",
                 ci.isRegistered() ? "S  " : "   ",
                 getCellInfoDisplayString(cidLte.getMcc()),
                 getCellInfoDisplayString(cidLte.getMnc()),
                 getCellInfoDisplayString(cidLte.getTac()),
                 getCellInfoDisplayString(cidLte.getCi()),
                 getCellInfoDisplayString(cidLte.getPci()),
+                getCellInfoDisplayString(cidLte.getEarfcn()),
                 getCellInfoDisplayString(ssLte.getDbm()),
                 getCellInfoDisplayString(ssLte.getRsrq()),
                 getCellInfoDisplayString(ssLte.getTimingAdvance()));
@@ -668,12 +686,13 @@
         CellIdentityWcdma cidWcdma = ci.getCellIdentity();
         CellSignalStrengthWcdma ssWcdma = ci.getCellSignalStrength();
 
-        return String.format("%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-5.5s %-4.4s\n",
+        return String.format("%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-6.6s %-3.3s %-4.4s\n",
                 ci.isRegistered() ? "S  " : "   ",
                 getCellInfoDisplayString(cidWcdma.getMcc()),
                 getCellInfoDisplayString(cidWcdma.getMnc()),
                 getCellInfoDisplayString(cidWcdma.getLac()),
                 getCellInfoDisplayString(cidWcdma.getCid()),
+                getCellInfoDisplayString(cidWcdma.getUarfcn()),
                 getCellInfoDisplayString(cidWcdma.getPsc()),
                 getCellInfoDisplayString(ssWcdma.getDbm()));
     }
@@ -700,18 +719,18 @@
             }
             if (lteCells.length() != 0) {
                 value += String.format(
-                        "LTE\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-3.3s %-4.4s %-4.4s %-2.2s\n",
-                        "SRV", "MCC", "MNC", "TAC", "CID", "PCI", "RSRP", "RSRQ", "TA");
+                        "LTE\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-3.3s %-6.6s %-4.4s %-4.4s %-2.2s\n",
+                        "SRV", "MCC", "MNC", "TAC", "CID", "PCI", "EARFCN", "RSRP", "RSRQ", "TA");
                 value += lteCells.toString();
             }
             if (wcdmaCells.length() != 0) {
-                value += String.format("WCDMA\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-5.5s %-4.4s\n",
-                        "SRV", "MCC", "MNC", "LAC", "CID", "PSC", "RSCP");
+                value += String.format("WCDMA\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-6.6s %-3.3s %-4.4s\n",
+                        "SRV", "MCC", "MNC", "LAC", "CID", "UARFCN", "PSC", "RSCP");
                 value += wcdmaCells.toString();
             }
             if (gsmCells.length() != 0) {
-                value += String.format("GSM\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-4.4s %-4.4s\n",
-                        "SRV", "MCC", "MNC", "LAC", "CID", "BSIC", "RSSI");
+                value += String.format("GSM\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-6.6s %-4.4s %-4.4s\n",
+                        "SRV", "MCC", "MNC", "LAC", "CID", "ARFCN", "BSIC", "RSSI");
                 value += gsmCells.toString();
             }
             if (cdmaCells.length() != 0) {
@@ -747,8 +766,7 @@
 
 
     private final void
-    updateServiceState() {
-        ServiceState serviceState = mPhoneStateReceiver.getServiceState();
+    updateServiceState(ServiceState serviceState) {
         int state = serviceState.getState();
         Resources r = getResources();
         String display = r.getString(R.string.radioInfo_unknown);
@@ -778,19 +796,18 @@
     }
 
     private final void
-    updatePhoneState() {
-        PhoneConstants.State state = mPhoneStateReceiver.getPhoneState();
+    updatePhoneState(int state) {
         Resources r = getResources();
         String display = r.getString(R.string.radioInfo_unknown);
 
         switch (state) {
-            case IDLE:
+            case TelephonyManager.CALL_STATE_IDLE:
                 display = r.getString(R.string.radioInfo_phone_idle);
                 break;
-            case RINGING:
+            case TelephonyManager.CALL_STATE_RINGING:
                 display = r.getString(R.string.radioInfo_phone_ringing);
                 break;
-            case OFFHOOK:
+            case TelephonyManager.CALL_STATE_OFFHOOK:
                 display = r.getString(R.string.radioInfo_phone_offhook);
                 break;
         }
@@ -823,11 +840,13 @@
     }
 
     private final void updateNetworkType() {
-        Resources r = getResources();
-        String display = SystemProperties.get(TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE,
-                r.getString(R.string.radioInfo_unknown));
-
-        network.setText(display);
+        if( phone != null ) {
+            ServiceState ss = phone.getServiceState();
+            dataNetwork.setText(ServiceState.rilRadioTechnologyToString(
+                    phone.getServiceState().getRilDataRadioTechnology()));
+            voiceNetwork.setText(ServiceState.rilRadioTechnologyToString(
+                    phone.getServiceState().getRilVoiceRadioTechnology()));
+        }
     }
 
     private final void
@@ -845,25 +864,6 @@
         number.setText(s);
     }
 
-    private final void updateDataStats() {
-        String s;
-
-        s = SystemProperties.get("net.gsm.radio-reset", "0");
-        resets.setText(s);
-
-        s = SystemProperties.get("net.gsm.attempt-gprs", "0");
-        attempts.setText(s);
-
-        s = SystemProperties.get("net.gsm.succeed-gprs", "0");
-        successes.setText(s);
-
-        //s = SystemProperties.get("net.gsm.disconnect", "0");
-        //disconnects.setText(s);
-
-        s = SystemProperties.get("net.ppp.reset-by-timeout", "0");
-        sentSinceReceived.setText(s);
-    }
-
     private final void updateDataStats2() {
         Resources r = getResources();
 
@@ -1003,48 +1003,6 @@
         httpClient.start();
     }
 
-    private final void updatePdpList() {
-        StringBuilder sb = new StringBuilder("========DATA=======\n");
-
-//        List<DataConnection> dcs = phone.getCurrentDataConnectionList();
-//
-//        for (DataConnection dc : dcs) {
-//            sb.append("    State=").append(dc.getStateAsString()).append("\n");
-//            if (dc.isActive()) {
-//                long timeElapsed =
-//                    (System.currentTimeMillis() - dc.getConnectionTime())/1000;
-//                sb.append("    connected at ")
-//                  .append(DateUtils.timeString(dc.getConnectionTime()))
-//                  .append(" and elapsed ")
-//                  .append(DateUtils.formatElapsedTime(timeElapsed));
-//
-//                if (dc instanceof GsmDataConnection) {
-//                    GsmDataConnection pdp = (GsmDataConnection)dc;
-//                    sb.append("\n    to ")
-//                      .append(pdp.getApn().toString());
-//                }
-//                sb.append("\nLinkProperties: ");
-//                sb.append(phone.getLinkProperties(phone.getActiveApnTypes()[0]).toString());
-//            } else if (dc.isInactive()) {
-//                sb.append("    disconnected with last try at ")
-//                  .append(DateUtils.timeString(dc.getLastFailTime()))
-//                  .append("\n    fail because ")
-//                  .append(dc.getLastFailCause().toString());
-//            } else {
-//                if (dc instanceof GsmDataConnection) {
-//                    GsmDataConnection pdp = (GsmDataConnection)dc;
-//                    sb.append("    is connecting to ")
-//                      .append(pdp.getApn().toString());
-//                } else {
-//                    sb.append("    is connecting");
-//                }
-//            }
-//            sb.append("\n===================");
-//        }
-
-        disconnects.setText(sb.toString());
-    }
-
     private MenuItem.OnMenuItemClickListener mViewADNCallback = new MenuItem.OnMenuItemClickListener() {
         public boolean onMenuItemClick(MenuItem item) {
             Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -1128,155 +1086,67 @@
         }
     };
 
-    OnClickListener mPowerButtonHandler = new OnClickListener() {
-        public void onClick(View v) {
-            //log("toggle radio power: currently " + (isRadioOn()?"on":"off"));
-            //FIXME: Replace with a TelephonyManager call
-            phone.setRadioPower(!isRadioOn());
-        }
+    private boolean isRadioOn() {
+        //FIXME: Replace with a TelephonyManager call
+        return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
+    }
+
+    private void updateRadioPowerState() {
+        //delightful hack to prevent on-checked-changed calls from
+        //actually forcing the radio preference to its transient/current value.
+        radioPowerOnSwitch.setOnCheckedChangeListener(null);
+        radioPowerOnSwitch.setChecked(isRadioOn());
+        radioPowerOnSwitch.setOnCheckedChangeListener(mRadioPowerOnChangeListener);
+    }
+
+    OnCheckedChangeListener mRadioPowerOnChangeListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            log("toggle radio power: currently " + (isRadioOn()?"on":"off"));
+            phone.setRadioPower(isChecked);
+       }
     };
 
-    class CellInfoListRateHandler implements OnClickListener {
-        int rates[] = {Integer.MAX_VALUE, 0, 5000};
-        int index = 0;
+    void setImsVoLteProvisionedState( boolean state ) {
+        log(String.format("toggle VoLTE provisioned: %s", ((state) ? "on":"off")));
 
-        public int getRate() {
-            return rates[index];
-        }
-
-        @Override
-        public void onClick(View v) {
-            index += 1;
-            index %= rates.length;
-
-            // FIXME: Replace with a TelephonyManager call
-            phone.setCellInfoListRate(rates[index]);
-            updateCellInfoListRate();
-
-            updateAllCellInfo();
-        }
-    }
-    CellInfoListRateHandler mCellInfoListRateHandler = new CellInfoListRateHandler();
-
-    private Button imsRegRequiredButton;
-    static final String PROPERTY_IMS_REG_REQUIRED = "persist.radio.imsregrequired";
-    OnClickListener mImsRegRequiredHandler = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            log(String.format("toggle %s: currently %s",
-                PROPERTY_IMS_REG_REQUIRED, (isImsRegRequired() ? "on":"off")));
-            boolean newValue = !isImsRegRequired();
-            SystemProperties.set(PROPERTY_IMS_REG_REQUIRED,
-                    newValue ? "1":"0");
-            updateImsRegRequiredState();
-        }
-    };
-
-    private boolean isImsRegRequired() {
-        return SystemProperties.getBoolean(PROPERTY_IMS_REG_REQUIRED, false);
-    }
-
-    private void updateImsRegRequiredState() {
-        log("updateImsRegRequiredState isImsRegRequired()=" + isImsRegRequired());
-        String buttonText = isImsRegRequired() ?
-                            getString(R.string.ims_reg_required_off) :
-                            getString(R.string.ims_reg_required_on);
-        imsRegRequiredButton.setText(buttonText);
-    }
-
-    private Button smsOverImsButton;
-    static final String PROPERTY_SMS_OVER_IMS = "persist.radio.imsallowmtsms";
-    OnClickListener mSmsOverImsHandler = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            log(String.format("toggle %s: currently %s",
-                    PROPERTY_SMS_OVER_IMS, (isSmsOverImsEnabled() ? "on":"off")));
-            boolean newValue = !isSmsOverImsEnabled();
-            SystemProperties.set(PROPERTY_SMS_OVER_IMS, newValue ? "1":"0");
-            updateSmsOverImsState();
-        }
-    };
-
-    private boolean isSmsOverImsEnabled() {
-        return SystemProperties.getBoolean(PROPERTY_SMS_OVER_IMS, false);
-    }
-
-    private Button imsVoLteProvisionedButton;
-    OnClickListener mImsVoLteProvisionedHandler = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            log(String.format("toggle VoLTE provisioned: currently %s",
-                    (isImsVoLteProvisioned() ? "on":"off")));
-            final boolean newValue = !isImsVoLteProvisioned();
-            if (phone != null) {
-                //TODO: Why does this have to be called within the phone's context?
-                if (mImsManager != null) {
-                    QueuedWork.singleThreadExecutor().submit(new Runnable() {
-                        public void run() {
-                            try {
-                                mImsManager.getConfigInterface().setProvisionedValue(
-                                        ImsConfig.ConfigConstants.VLT_SETTING_ENABLED,
-                                        newValue? 1 : 0);
-                            } catch (ImsException e) {
-                                Log.e(TAG, "setImsVoLteProvisioned() exception:", e);
-                            }
-                        }
-                    });
+        if (phone != null && mImsManager != null) {
+            QueuedWork.singleThreadExecutor().submit(new Runnable() {
+                public void run() {
+                    try {
+                        mImsManager.getConfigInterface().setProvisionedValue(
+                                ImsConfig.ConfigConstants.VLT_SETTING_ENABLED,
+                                state? 1 : 0);
+                    } catch (ImsException e) {
+                        Log.e(TAG, "setImsVoLteProvisioned() exception:", e);
+                    }
                 }
-            }
-            updateImsVoLteProvisionedState();
+            });
         }
-    };
+    }
 
     private boolean isImsVoLteProvisioned() {
-        if (phone != null) {
-            //TODO: Why does this have to be called within the phone's context?
-            if(mImsManager != null ) {
-              return mImsManager.isVolteProvisionedOnDevice(phone.getContext());
-            }
+        if (phone != null && mImsManager != null) {
+            return mImsManager.isVolteEnabledByPlatform(phone.getContext())
+                && mImsManager.isVolteProvisionedOnDevice(phone.getContext());
         }
         return false;
     }
 
-    private void updateImsVoLteProvisionedState() {
-        log("updateImsVoLteProvisionedState isImsVoLteProvisioned()=" + isImsVoLteProvisioned());
-        String buttonText = isImsVoLteProvisioned() ?
-                getString(R.string.volte_provisioned_flag_off) :
-                getString(R.string.volte_provisioned_flag_on);
-        imsVoLteProvisionedButton.setText(buttonText);
-    }
-
-    private void updateSmsOverImsState() {
-        log("updateSmsOverImsState isSmsOverImsEnabled()=" + isSmsOverImsEnabled());
-        String buttonText = isSmsOverImsEnabled() ?
-                            getString(R.string.sms_over_ims_off) :
-                            getString(R.string.sms_over_ims_on);
-        smsOverImsButton.setText(buttonText);
-    }
-
-    private Button lteRamDumpButton;
-    static final String PROPERTY_LTE_RAM_DUMP = "persist.radio.ramdump";
-    OnClickListener mLteRamDumpHandler = new OnClickListener() {
+    OnCheckedChangeListener mImsVoLteCheckedChangeListener = new OnCheckedChangeListener() {
         @Override
-        public void onClick(View v) {
-            log(String.format("toggle %s: currently %s",
-                    PROPERTY_LTE_RAM_DUMP, (isSmsOverImsEnabled() ? "on":"off")));
-            boolean newValue = !isLteRamDumpEnabled();
-            SystemProperties.set(PROPERTY_LTE_RAM_DUMP, newValue ? "1":"0");
-            updateLteRamDumpState();
-        }
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setImsVoLteProvisionedState(isChecked);
+       }
     };
 
-    private boolean isLteRamDumpEnabled() {
-        return SystemProperties.getBoolean(PROPERTY_LTE_RAM_DUMP, false);
-    }
-
-    private void updateLteRamDumpState() {
-        log("updateLteRamDumpState isLteRamDumpEnabled()=" + isLteRamDumpEnabled());
-        String buttonText = isLteRamDumpEnabled() ?
-                            getString(R.string.lte_ram_dump_off) :
-                            getString(R.string.lte_ram_dump_on);
-        lteRamDumpButton.setText(buttonText);
+    private void updateImsVoLteProvisionedState() {
+        log("updateImsVoLteProvisionedState isImsVoLteProvisioned()=" + isImsVoLteProvisioned());
+        //delightful hack to prevent on-checked-changed calls from
+        //actually forcing the ims provisioning to its transient/current value.
+        imsVoLteProvisionedSwitch.setOnCheckedChangeListener(null);
+        imsVoLteProvisionedSwitch.setChecked(isImsVoLteProvisioned());
+        imsVoLteProvisionedSwitch.setOnCheckedChangeListener(mImsVoLteCheckedChangeListener);
     }
 
     OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
@@ -1336,32 +1206,17 @@
         }
     };
 
-    private String[] mPreferredNetworkLabels = {
-            "WCDMA preferred",
-            "GSM only",
-            "WCDMA only",
-            "GSM auto (PRL)",
-            "CDMA auto (PRL)",
-            "CDMA only",
-            "EvDo only",
-            "Global auto (PRL)",
-            "LTE/CDMA auto (PRL)",
-            "LTE/UMTS auto (PRL)",
-            "LTE/CDMA/UMTS auto (PRL)",
-            "LTE only",
-            "LTE/WCDMA",
-            "TD-SCDMA only",
-            "TD-SCDMA/WCDMA",
-            "LTE/TD-SCDMA",
-            "TD-SCDMA/GSM",
-            "TD-SCDMA/UMTS",
-            "LTE/TD-SCDMA/WCDMA",
-            "LTE/TD-SCDMA/UMTS",
-            "TD-SCDMA/CDMA/UMTS",
-            "Global/TD-SCDMA",
-            "Unknown"};
+    AdapterView.OnItemSelectedListener mCellInfoRefreshRateHandler  =
+            new AdapterView.OnItemSelectedListener() {
 
-    private void log(String s) {
-        Log.d(TAG, "[RadioInfo] " + s);
-    }
+        public void onItemSelected(AdapterView parent, View v, int pos, long id) {
+            mCellInfoRefreshRateIndex = pos;
+            phone.setCellInfoListRate(mCellInfoRefreshRates[pos]);
+            updateAllCellInfo();
+        }
+
+        public void onNothingSelected(AdapterView parent) {
+        }
+    };
+
 }
diff --git a/src/com/android/settings/SaveChosenLockWorkerBase.java b/src/com/android/settings/SaveChosenLockWorkerBase.java
index 39620d5..7ce7a90 100644
--- a/src/com/android/settings/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/SaveChosenLockWorkerBase.java
@@ -68,7 +68,6 @@
         mHasChallenge = hasChallenge;
         mChallenge = challenge;
         // This will be a no-op for non managed profiles.
-        mUtils.setSeparateProfileChallengeEnabled(mUserId, true);
         mWasSecureBefore = mUtils.isSecure(mUserId);
 
         Context context = getContext();
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index d8e821c..5b5b9ef 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -150,6 +150,7 @@
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
                 return R.string.screen_pinning_unlock_password;
             case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
                 if (mLockPatternUtils.isLockPatternEnabled(UserHandle.myUserId())) {
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 32cd348..049660e 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -130,6 +130,7 @@
 
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private LockPatternUtils mLockPatternUtils;
+    private ManagedLockPasswordProvider mManagedPasswordProvider;
 
     private SwitchPreference mVisiblePatternProfile;
     private SwitchPreference mUnifyProfile;
@@ -164,6 +165,8 @@
 
         mLockPatternUtils = new LockPatternUtils(getActivity());
 
+        mManagedPasswordProvider = ManagedLockPasswordProvider.get(getActivity(), MY_USER_ID);
+
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         mUm = UserManager.get(getActivity());
@@ -177,7 +180,8 @@
     }
 
     private static int getResIdForLockUnlockScreen(Context context,
-            LockPatternUtils lockPatternUtils, int userId) {
+            LockPatternUtils lockPatternUtils, ManagedLockPasswordProvider managedPasswordProvider,
+            int userId) {
         final boolean isMyUser = userId == MY_USER_ID;
         int resid = 0;
         if (!lockPatternUtils.isSecure(userId)) {
@@ -205,6 +209,9 @@
                     resid = isMyUser ? R.xml.security_settings_password
                             : R.xml.security_settings_password_profile;
                     break;
+                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                    resid = managedPasswordProvider.getResIdForLockUnlockScreen(!isMyUser);
+                    break;
             }
         }
         return resid;
@@ -225,7 +232,8 @@
         root = getPreferenceScreen();
 
         // Add options for lock/unlock screen
-        final int resid = getResIdForLockUnlockScreen(getActivity(), mLockPatternUtils, MY_USER_ID);
+        final int resid = getResIdForLockUnlockScreen(getActivity(), mLockPatternUtils,
+                mManagedPasswordProvider, MY_USER_ID);
         addPreferencesFromResource(resid);
 
         // DO or PO installed in the user may disallow to change password.
@@ -237,7 +245,8 @@
             addPreferencesFromResource(R.xml.security_settings_profile);
             addPreferencesFromResource(R.xml.security_settings_unification);
             final int profileResid = getResIdForLockUnlockScreen(
-                    getActivity(), mLockPatternUtils, mProfileChallengeUserId);
+                    getActivity(), mLockPatternUtils, mManagedPasswordProvider,
+                    mProfileChallengeUserId);
             addPreferencesFromResource(profileResid);
             maybeAddFingerprintPreference(root, mProfileChallengeUserId);
             if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId)) {
@@ -616,6 +625,10 @@
             startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
                     R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
         } else if (KEY_UNLOCK_SET_OR_CHANGE_PROFILE.equals(key)) {
+            if (Utils.startQuiteModeDialogIfNecessary(this.getActivity(), mUm,
+                    mProfileChallengeUserId)) {
+                return false;
+            }
             Bundle extras = new Bundle();
             extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
             startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
@@ -697,8 +710,6 @@
     private void unifyLocks() {
         int profileQuality =
                 mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId);
-        mLockPatternUtils.clearLock(mProfileChallengeUserId);
-        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false);
         if (profileQuality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
             mLockPatternUtils.saveLockPattern(
                     LockPatternUtils.stringToPattern(mCurrentProfilePassword),
@@ -708,6 +719,8 @@
                     mCurrentProfilePassword, mCurrentDevicePassword,
                     profileQuality, MY_USER_ID);
         }
+        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
+                mCurrentProfilePassword);
         final boolean profilePatternVisibility =
                 mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
         mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);
@@ -716,14 +729,13 @@
     }
 
     private void unifyUncompliantLocks() {
-        mLockPatternUtils.clearLock(mProfileChallengeUserId);
-        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false);
+        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
+                mCurrentProfilePassword);
         startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
                 R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
     }
 
     private void ununifyLocks() {
-        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, true);
         Bundle extras = new Bundle();
         extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
         startFragment(this,
@@ -738,8 +750,16 @@
         final String key = preference.getKey();
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
         if (KEY_VISIBLE_PATTERN_PROFILE.equals(key)) {
+            if (Utils.startQuiteModeDialogIfNecessary(this.getActivity(), mUm,
+                    mProfileChallengeUserId)) {
+                return false;
+            }
             lockPatternUtils.setVisiblePatternEnabled((Boolean) value, mProfileChallengeUserId);
         } else if (KEY_UNIFICATION.equals(key)) {
+            if (Utils.startQuiteModeDialogIfNecessary(this.getActivity(), mUm,
+                    mProfileChallengeUserId)) {
+                return false;
+            }
             if ((Boolean) value) {
                 final boolean compliantForDevice =
                         (mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId)
@@ -795,6 +815,8 @@
             final List<SearchIndexableResource> index = new ArrayList<SearchIndexableResource>();
 
             final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
+            final ManagedLockPasswordProvider managedPasswordProvider =
+                    ManagedLockPasswordProvider.get(context, MY_USER_ID);
             final DevicePolicyManager dpm = (DevicePolicyManager)
                     context.getSystemService(Context.DEVICE_POLICY_SERVICE);
             final UserManager um = UserManager.get(context);
@@ -808,7 +830,7 @@
                             || !isPasswordManaged(profileUserId, context, dpm))) {
                 // Add options for lock/unlock screen
                 final int resId = getResIdForLockUnlockScreen(context, lockPatternUtils,
-                        MY_USER_ID);
+                        managedPasswordProvider, MY_USER_ID);
                 index.add(getSearchResource(context, resId));
             }
 
@@ -816,7 +838,7 @@
                     && lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)
                     && !isPasswordManaged(profileUserId, context, dpm)) {
                 index.add(getSearchResource(context, getResIdForLockUnlockScreen(context,
-                        lockPatternUtils, profileUserId)));
+                        lockPatternUtils, managedPasswordProvider, profileUserId)));
             }
 
             if (um.isAdminUser()) {
@@ -833,7 +855,8 @@
             }
 
             final SearchIndexableResource sir = getSearchResource(context,
-                    SecuritySubSettings.getResIdForLockUnlockSubScreen(context, lockPatternUtils));
+                    SecuritySubSettings.getResIdForLockUnlockSubScreen(context, lockPatternUtils,
+                            managedPasswordProvider));
             sir.className = SecuritySubSettings.class.getName();
             index.add(sir);
 
@@ -1039,7 +1062,8 @@
             root = null;
 
             final int resid = getResIdForLockUnlockSubScreen(getActivity(),
-                    new LockPatternUtils(getContext()));
+                    new LockPatternUtils(getContext()),
+                    ManagedLockPasswordProvider.get(getContext(), MY_USER_ID));
             addPreferencesFromResource(resid);
 
             // lock after preference
@@ -1117,7 +1141,8 @@
             if (mDPM != null) {
                 final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(
                         getActivity());
-                final long adminTimeout = mDPM.getMaximumTimeToLock(null);
+                final long adminTimeout = mDPM
+                        .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
                 final long displayTimeout = Math.max(0,
                         Settings.System.getInt(getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
                 // This setting is a slave to display timeout when a device policy is enforced.
@@ -1176,7 +1201,8 @@
         }
 
         private static int getResIdForLockUnlockSubScreen(Context context,
-                LockPatternUtils lockPatternUtils) {
+                LockPatternUtils lockPatternUtils,
+                ManagedLockPasswordProvider managedPasswordProvider) {
             if (lockPatternUtils.isSecure(MY_USER_ID)) {
                 switch (lockPatternUtils.getKeyguardStoredPasswordQuality(MY_USER_ID)) {
                     case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
@@ -1188,6 +1214,8 @@
                     case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
                     case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
                         return R.xml.security_settings_password_sub;
+                    case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                        return managedPasswordProvider.getResIdForLockUnlockSubScreen();
                 }
             } else if (!lockPatternUtils.isLockScreenDisabled(MY_USER_ID)) {
                 return R.xml.security_settings_slide_sub;
@@ -1266,17 +1294,15 @@
                                 }
                             }
                     )
-                    .setNegativeButton(R.string.cancel,
-                            new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int whichButton) {
-                                    parentFragment.updateUnificationPreference();
-                                    dismiss();
-                                }
-                            }
-                    )
+                    .setNegativeButton(R.string.cancel, null)
                     .create();
         }
+
+        @Override
+        public void onDismiss(DialogInterface dialog) {
+            super.onDismiss(dialog);
+            ((SecuritySettings) getParentFragment()).updateUnificationPreference();
+        }
     }
 
 }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 9c3a0d9..b28d4fb 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -96,7 +96,7 @@
     public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
     public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class VrListenerSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ConditionProviderSettingsActivity extends SettingsActivity { /* empty */ }
     public static class UsbSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index cecf708..6b9bdb3 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -66,6 +66,7 @@
 import com.android.settings.applications.ProcessStatsUi;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.WriteSettingsDetails;
+import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.SearchResultsSummary;
@@ -325,6 +326,7 @@
             WriteSettingsDetails.class.getName(),
             AdvancedAppSettings.class.getName(),
             WallpaperTypeSettings.class.getName(),
+            VrListenerSettings.class.getName(),
     };
 
 
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 16df343..e0a2844 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -44,6 +44,7 @@
 import android.widget.Button;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.widget.FloatingActionButton;
+import com.android.settingslib.HelpUtils;
 
 import java.util.UUID;
 
diff --git a/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
new file mode 100644
index 0000000..22dc936
--- /dev/null
+++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings;
+
+import android.annotation.NonNull;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.DialogInterface;
+import android.net.http.SslCertificate;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.view.View;
+import android.view.animation.AnimationUtils;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+
+import com.android.settings.TrustedCredentialsSettings.CertHolder;
+
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+
+class TrustedCredentialsDialogBuilder extends AlertDialog.Builder {
+    public interface DelegateInterface {
+        List<X509Certificate> getX509CertsFromCertHolder(CertHolder certHolder);
+        void removeOrInstallCert(CertHolder certHolder);
+    }
+
+    private final DialogEventHandler mDialogEventHandler;
+
+    public TrustedCredentialsDialogBuilder(Activity activity, DelegateInterface delegate) {
+        super(activity);
+        mDialogEventHandler = new DialogEventHandler(activity, delegate);
+
+        initDefaultBuilderParams();
+    }
+
+    public TrustedCredentialsDialogBuilder setCertHolder(CertHolder certHolder) {
+        return setCertHolders(certHolder == null ? new CertHolder[0]
+                : new CertHolder[]{certHolder});
+    }
+
+    public TrustedCredentialsDialogBuilder setCertHolders(@NonNull CertHolder[] certHolders) {
+        mDialogEventHandler.setCertHolders(certHolders);
+        return this;
+    }
+
+    @Override
+    public AlertDialog create() {
+        AlertDialog dialog = super.create();
+        dialog.setOnShowListener(mDialogEventHandler);
+        mDialogEventHandler.setDialog(dialog);
+        return dialog;
+    }
+
+    private void initDefaultBuilderParams() {
+        setTitle(com.android.internal.R.string.ssl_certificate);
+        setView(mDialogEventHandler.mRootContainer);
+
+        // Enable buttons here. The actual labels and listeners are configured in nextOrDismiss
+        setPositiveButton(R.string.trusted_credentials_trust_label, null);
+        setNegativeButton(android.R.string.ok, null);
+    }
+
+    private static class DialogEventHandler implements DialogInterface.OnShowListener,
+            View.OnClickListener  {
+        private static final long OUT_DURATION_MS = 300;
+        private static final long IN_DURATION_MS = 200;
+
+        private final Activity mActivity;
+        private final DevicePolicyManager mDpm;
+        private final UserManager mUserManager;
+        private final DelegateInterface mDelegate;
+        private final LinearLayout mRootContainer;
+
+        private int mCurrentCertIndex = -1;
+        private AlertDialog mDialog;
+        private Button mPositiveButton;
+        private Button mNegativeButton;
+        private boolean mNeedsApproval;
+        private CertHolder[] mCertHolders = new CertHolder[0];
+        private View mCurrentCertLayout = null;
+
+        public DialogEventHandler(Activity activity, DelegateInterface delegate) {
+            mActivity = activity;
+            mDpm = activity.getSystemService(DevicePolicyManager.class);
+            mUserManager = activity.getSystemService(UserManager.class);
+            mDelegate = delegate;
+
+            mRootContainer = new LinearLayout(mActivity);
+            mRootContainer.setOrientation(LinearLayout.VERTICAL);
+        }
+
+        public void setDialog(AlertDialog dialog) {
+            mDialog = dialog;
+        }
+
+        public void setCertHolders(CertHolder[] certHolder) {
+            mCertHolders = certHolder;
+        }
+
+        @Override
+        public void onShow(DialogInterface dialogInterface) {
+            // Config the display content only when the dialog is shown because the
+            // positive/negative buttons don't exist until the dialog is shown
+            nextOrDismiss();
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (view == mPositiveButton) {
+                if (mNeedsApproval) {
+                    onClickTrust();
+                } else {
+                    onClickOk();
+                }
+            } else if (view == mNegativeButton) {
+                onClickRemove();
+            }
+        }
+
+        private void onClickOk() {
+            nextOrDismiss();
+        }
+
+        private void onClickTrust() {
+            CertHolder certHolder = getCurrentCertInfo();
+            mDpm.approveCaCert(certHolder.getAlias(), certHolder.getUserId(), true);
+            nextOrDismiss();
+        }
+
+        private void onClickRemove() {
+            final CertHolder certHolder = getCurrentCertInfo();
+            new AlertDialog.Builder(mActivity)
+                    .setMessage(getButtonConfirmation(certHolder))
+                    .setPositiveButton(android.R.string.yes,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    mDelegate.removeOrInstallCert(certHolder);
+                                    dialog.dismiss();
+                                    nextOrDismiss();
+                                }
+                            })
+                    .setNegativeButton(android.R.string.no, null)
+                    .show();
+        }
+
+        private CertHolder getCurrentCertInfo() {
+            return mCurrentCertIndex < mCertHolders.length ? mCertHolders[mCurrentCertIndex] : null;
+        }
+
+        private void nextOrDismiss() {
+            mCurrentCertIndex++;
+            // find next non-null cert or dismiss
+            while (mCurrentCertIndex < mCertHolders.length && getCurrentCertInfo() == null) {
+                mCurrentCertIndex++;
+            }
+
+            if (mCurrentCertIndex >= mCertHolders.length) {
+                mDialog.dismiss();
+                return;
+            }
+
+            updateViewContainer();
+            updatePositiveButton();
+            updateNegativeButton();
+        }
+
+        private void updatePositiveButton() {
+            final CertHolder certHolder = getCurrentCertInfo();
+            mNeedsApproval = !certHolder.isSystemCert() &&
+                    !mDpm.isCaCertApproved(certHolder.getAlias(), certHolder.getUserId());
+
+            // The ok button is optional. User can still dismiss the dialog by other means.
+            // Display it only when trust button is not displayed, because we want users to
+            // either remove or trust a CA cert when the cert is installed by DPC app.
+            CharSequence displayText = mActivity.getText(mNeedsApproval
+                    ? R.string.trusted_credentials_trust_label
+                    : android.R.string.ok);
+            mPositiveButton = updateButton(DialogInterface.BUTTON_POSITIVE, displayText);
+        }
+
+        private void updateNegativeButton() {
+            final CertHolder certHolder = getCurrentCertInfo();
+            final boolean showRemoveButton = !mUserManager.hasUserRestriction(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS,
+                    new UserHandle(certHolder.getUserId()));
+            CharSequence displayText = mActivity.getText(getButtonLabel(certHolder));
+            mNegativeButton = updateButton(DialogInterface.BUTTON_NEGATIVE, displayText);
+            mNegativeButton.setVisibility(showRemoveButton ? View.VISIBLE : View.GONE);
+        }
+
+        /**
+         * mDialog.setButton doesn't trigger text refresh since mDialog has been shown.
+         * It's invoked only in case mDialog is refreshed.
+         * setOnClickListener is invoked to avoid dismiss dialog onClick
+         */
+        private Button updateButton(int buttonType, CharSequence displayText) {
+            mDialog.setButton(buttonType, displayText, (DialogInterface.OnClickListener) null);
+            Button button = mDialog.getButton(buttonType);
+            button.setText(displayText);
+            button.setOnClickListener(this);
+            return button;
+        }
+
+
+        private void updateViewContainer() {
+            CertHolder certHolder = getCurrentCertInfo();
+            LinearLayout nextCertLayout = getCertLayout(certHolder);
+
+            // Displaying first cert doesn't require animation
+            if (mCurrentCertLayout == null) {
+                mCurrentCertLayout = nextCertLayout;
+                mRootContainer.addView(mCurrentCertLayout);
+            } else {
+                animateViewTransition(nextCertLayout);
+            }
+        }
+
+        private LinearLayout getCertLayout(final CertHolder certHolder) {
+            final ArrayList<View> views =  new ArrayList<View>();
+            final ArrayList<String> titles = new ArrayList<String>();
+            List<X509Certificate> certificates = mDelegate.getX509CertsFromCertHolder(certHolder);
+            if (certificates != null) {
+                for (X509Certificate certificate : certificates) {
+                    SslCertificate sslCert = new SslCertificate(certificate);
+                    views.add(sslCert.inflateCertificateView(mActivity));
+                    titles.add(sslCert.getIssuedTo().getCName());
+                }
+            }
+
+            ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(mActivity,
+                    android.R.layout.simple_spinner_item,
+                    titles);
+            arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            Spinner spinner = new Spinner(mActivity);
+            spinner.setAdapter(arrayAdapter);
+            spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position,
+                        long id) {
+                    for (int i = 0; i < views.size(); i++) {
+                        views.get(i).setVisibility(i == position ? View.VISIBLE : View.GONE);
+                    }
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+                }
+            });
+
+            LinearLayout certLayout = new LinearLayout(mActivity);
+            certLayout.setOrientation(LinearLayout.VERTICAL);
+            certLayout.addView(spinner);
+            for (int i = 0; i < views.size(); ++i) {
+                View certificateView = views.get(i);
+                // Show first cert by default
+                certificateView.setVisibility(i == 0 ? View.VISIBLE : View.GONE);
+                certLayout.addView(certificateView);
+            }
+
+            return certLayout;
+        }
+
+        private static int getButtonConfirmation(CertHolder certHolder) {
+            return certHolder.isSystemCert() ? ( certHolder.isDeleted()
+                        ? R.string.trusted_credentials_enable_confirmation
+                        : R.string.trusted_credentials_disable_confirmation )
+                    : R.string.trusted_credentials_remove_confirmation;
+        }
+
+        private static int getButtonLabel(CertHolder certHolder) {
+            return certHolder.isSystemCert() ? ( certHolder.isDeleted()
+                        ? R.string.trusted_credentials_enable_label
+                        : R.string.trusted_credentials_disable_label )
+                    : R.string.trusted_credentials_remove_label;
+        }
+
+        /* Animation code */
+        private void animateViewTransition(final View nextCertView) {
+            animateOldContent(new Runnable() {
+                @Override
+                public void run() {
+                    addAndAnimateNewContent(nextCertView);
+                }
+            });
+        }
+
+        private void animateOldContent(Runnable callback) {
+            // Fade out
+            mCurrentCertLayout.animate()
+                    .alpha(0)
+                    .setDuration(OUT_DURATION_MS)
+                    .setInterpolator(AnimationUtils.loadInterpolator(mActivity,
+                            android.R.interpolator.fast_out_linear_in))
+                    .withEndAction(callback)
+                    .start();
+        }
+
+        private void addAndAnimateNewContent(View nextCertLayout) {
+            mCurrentCertLayout = nextCertLayout;
+            mRootContainer.removeAllViews();
+            mRootContainer.addView(nextCertLayout);
+
+            mRootContainer.addOnLayoutChangeListener( new View.OnLayoutChangeListener() {
+                @Override
+                public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                        int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                    mRootContainer.removeOnLayoutChangeListener(this);
+
+                    // Animate slide in from the right
+                    final int containerWidth = mRootContainer.getWidth();
+                    mCurrentCertLayout.setTranslationX(containerWidth);
+                    mCurrentCertLayout.animate()
+                            .translationX(0)
+                            .setInterpolator(AnimationUtils.loadInterpolator(mActivity,
+                                    android.R.interpolator.linear_out_slow_in))
+                            .setDuration(IN_DURATION_MS)
+                            .start();
+                }
+            });
+        }
+    }
+}
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 5e0aea7..e371229 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -16,8 +16,7 @@
 
 package com.android.settings;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
+import android.annotation.UiThread;
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
@@ -41,16 +40,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.BaseExpandableListAdapter;
-import android.widget.Button;
 import android.widget.ExpandableListView;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
-import android.widget.Spinner;
 import android.widget.Switch;
 import android.widget.TabHost;
 import android.widget.TextView;
@@ -67,12 +61,17 @@
 import java.util.HashMap;
 import java.util.List;
 
-public class TrustedCredentialsSettings extends OptionsMenuFragment {
+public class TrustedCredentialsSettings extends OptionsMenuFragment
+        implements TrustedCredentialsDialogBuilder.DelegateInterface {
+
+    public static final String ARG_SHOW_NEW_FOR_USER = "ARG_SHOW_NEW_FOR_USER";
 
     private static final String TAG = "TrustedCredentialsSettings";
 
     private UserManager mUserManager;
     private KeyguardManager mKeyguardManager;
+    private int mTrustAllCaUserId;
+
 
     private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
 
@@ -135,30 +134,6 @@
             }
             throw new AssertionError();
         }
-        private int getButtonLabel(CertHolder certHolder) {
-            switch (this) {
-                case SYSTEM:
-                    if (certHolder.mDeleted) {
-                        return R.string.trusted_credentials_enable_label;
-                    }
-                    return R.string.trusted_credentials_disable_label;
-                case USER:
-                    return R.string.trusted_credentials_remove_label;
-            }
-            throw new AssertionError();
-        }
-        private int getButtonConfirmation(CertHolder certHolder) {
-            switch (this) {
-                case SYSTEM:
-                    if (certHolder.mDeleted) {
-                        return R.string.trusted_credentials_enable_confirmation;
-                    }
-                    return R.string.trusted_credentials_disable_confirmation;
-                case USER:
-                    return R.string.trusted_credentials_remove_confirmation;
-            }
-            throw new AssertionError();
-        }
         private void postOperationUpdate(boolean ok, CertHolder certHolder) {
             if (ok) {
                 if (certHolder.mTab.mSwitch) {
@@ -213,6 +188,9 @@
         mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         mKeyguardManager = (KeyguardManager) getActivity()
                 .getSystemService(Context.KEYGUARD_SERVICE);
+        mTrustAllCaUserId = getActivity().getIntent().getIntExtra(ARG_SHOW_NEW_FOR_USER,
+                UserHandle.USER_NULL);
+
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
@@ -590,6 +568,37 @@
                 mList.setVisibility(View.VISIBLE);
                 mProgressBar.setProgress(0);
                 mAliasLoaders.remove(mTab);
+                showTrustAllCaDialogIfNeeded();
+            }
+
+            private boolean isUserTabAndTrustAllCertMode() {
+                return isTrustAllCaCertModeInProgress() && mTab == Tab.USER;
+            }
+
+            @UiThread
+            private void showTrustAllCaDialogIfNeeded() {
+                if (!isUserTabAndTrustAllCertMode()) {
+                    return;
+                }
+                List<CertHolder> certHolders = mCertHoldersByUserId.get(mTrustAllCaUserId);
+                if (certHolders == null) {
+                    return;
+                }
+
+                List<CertHolder> unapprovedUserCertHolders = new ArrayList<>();
+                final DevicePolicyManager dpm = mContext.getSystemService(
+                        DevicePolicyManager.class);
+                for (CertHolder cert : certHolders) {
+                    if (cert != null && !dpm.isCaCertApproved(cert.mAlias, mTrustAllCaUserId)) {
+                        unapprovedUserCertHolders.add(cert);
+                    }
+                }
+
+                if (unapprovedUserCertHolders.size() == 0) {
+                    Log.w(TAG, "no cert is pending approval for user " + mTrustAllCaUserId);
+                    return;
+                }
+                showTrustAllCaDialog(unapprovedUserCertHolders);
             }
         }
 
@@ -603,7 +612,7 @@
         }
     }
 
-    private static class CertHolder implements Comparable<CertHolder> {
+    /* package */ static class CertHolder implements Comparable<CertHolder> {
         public int mProfileId;
         private final IKeyChainService mService;
         private final TrustedCertificateAdapterCommons mAdapter;
@@ -679,6 +688,22 @@
         @Override public int hashCode() {
             return mAlias.hashCode();
         }
+
+        public int getUserId() {
+            return mProfileId;
+        }
+
+        public String getAlias() {
+            return mAlias;
+        }
+
+        public boolean isSystemCert() {
+            return mTab == Tab.SYSTEM;
+        }
+
+        public boolean isDeleted() {
+            return mDeleted;
+        }
     }
 
     private View getViewForCertificate(CertHolder certHolder, Tab mTab, View convertView,
@@ -716,91 +741,34 @@
         private Switch mSwitch;
     }
 
-    private void showCertDialog(final CertHolder certHolder) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(com.android.internal.R.string.ssl_certificate);
-
-        final DevicePolicyManager dpm = getActivity().getSystemService(DevicePolicyManager.class);
-        final ArrayList<View> views =  new ArrayList<View>();
-        final ArrayList<String> titles = new ArrayList<String>();
-        addCertChain(certHolder, views, titles);
-
-        ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getActivity(),
-                android.R.layout.simple_spinner_item,
-                titles);
-        arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        Spinner spinner = new Spinner(getActivity());
-        spinner.setAdapter(arrayAdapter);
-        spinner.setOnItemSelectedListener(new OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                for (int i = 0; i < views.size(); i++) {
-                    views.get(i).setVisibility(i == position ? View.VISIBLE : View.GONE);
-                }
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-
-        LinearLayout container = new LinearLayout(getActivity());
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.addView(spinner);
-        for (int i = 0; i < views.size(); ++i) {
-            View certificateView = views.get(i);
-            if (i != 0) {
-                certificateView.setVisibility(View.GONE);
-            }
-            container.addView(certificateView);
-        }
-        builder.setView(container);
-
-        if (certHolder.mTab == Tab.USER &&
-                !dpm.isCaCertApproved(certHolder.mAlias, certHolder.mProfileId)) {
-            builder.setPositiveButton(R.string.trusted_credentials_trust_label,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int id) {
-                            dpm.approveCaCert(certHolder.mAlias, certHolder.mProfileId, true);
-                        }
-                    });
-        } else {
-            // The ok button is optional. Display it only when trust button is not displayed.
-            // User can still dismiss the dialog by other means.
-            builder.setPositiveButton(android.R.string.ok, null);
-        }
-
-        if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS,
-                new UserHandle(certHolder.mProfileId))) {
-            builder.setNegativeButton(certHolder.mTab.getButtonLabel(certHolder),
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(final DialogInterface parentDialog, int i) {
-                            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-                            builder.setMessage(certHolder.mTab.getButtonConfirmation(certHolder));
-                            builder.setPositiveButton(android.R.string.yes,
-                                    new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int id) {
-                                            new AliasOperation(certHolder).execute();
-                                            dialog.dismiss();
-                                            parentDialog.dismiss();
-                                        }
-                                    });
-                            builder.setNegativeButton(android.R.string.no, null);
-                            AlertDialog alert = builder.create();
-                            alert.show();
-                        }
-                    });
-        }
-
-        builder.show();
+    private boolean isTrustAllCaCertModeInProgress() {
+        return mTrustAllCaUserId != UserHandle.USER_NULL;
     }
 
-    private void addCertChain(final CertHolder certHolder,
-            final ArrayList<View> views, final ArrayList<String> titles) {
+    private void showTrustAllCaDialog(List<CertHolder> unapprovedCertHolders) {
+        final CertHolder[] arr = unapprovedCertHolders.toArray(
+                new CertHolder[unapprovedCertHolders.size()]);
+        new TrustedCredentialsDialogBuilder(getActivity(), this)
+                .setCertHolders(arr)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialogInterface) {
+                        // Avoid starting dialog again after Activity restart.
+                        getActivity().getIntent().removeExtra(ARG_SHOW_NEW_FOR_USER);
+                        mTrustAllCaUserId = UserHandle.USER_NULL;
+                    }
+                })
+                .show();
+    }
 
+    private void showCertDialog(final CertHolder certHolder) {
+        new TrustedCredentialsDialogBuilder(getActivity(), this)
+                .setCertHolder(certHolder)
+                .show();
+    }
+
+    @Override
+    public List<X509Certificate> getX509CertsFromCertHolder(CertHolder certHolder) {
         List<X509Certificate> certificates = null;
         try {
             KeyChainConnection keyChainConnection = mKeyChainConnectionByProfileId.get(
@@ -817,18 +785,13 @@
         } catch (RemoteException ex) {
             Log.e(TAG, "RemoteException while retrieving certificate chain for root "
                     + certHolder.mAlias, ex);
-            return;
         }
-        for (X509Certificate certificate : certificates) {
-            addCertDetails(certificate, views, titles);
-        }
+        return certificates;
     }
 
-    private void addCertDetails(X509Certificate certificate, final ArrayList<View> views,
-            final ArrayList<String> titles) {
-        SslCertificate sslCert = new SslCertificate(certificate);
-        views.add(sslCert.inflateCertificateView(getActivity()));
-        titles.add(sslCert.getIssuedTo().getCName());
+    @Override
+    public void removeOrInstallCert(CertHolder certHolder) {
+        new AliasOperation(certHolder).execute();
     }
 
     private class AliasOperation extends AsyncTask<Void, Void, Boolean> {
@@ -854,8 +817,7 @@
                 }
             } catch (CertificateEncodingException | SecurityException | IllegalStateException
                     | RemoteException e) {
-                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias,
-                        e);
+                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias, e);
                 return false;
             }
         }
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index 6438764..a09800b 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -104,10 +104,12 @@
             final Bundle args = new Bundle();
             args.putParcelable(ARG_CREDENTIAL, item);
 
-            final CredentialDialogFragment frag = new CredentialDialogFragment();
-            frag.setTargetFragment(target, /* requestCode */ -1);
-            frag.setArguments(args);
-            frag.show(target.getFragmentManager(), TAG);
+            if (target.getFragmentManager().findFragmentByTag(TAG) == null) {
+                final DialogFragment frag = new CredentialDialogFragment();
+                frag.setTargetFragment(target, /* requestCode */ -1);
+                frag.setArguments(args);
+                frag.show(target.getFragmentManager(), TAG);
+            }
         }
 
         @Override
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 84bb2dd..4dd203c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -87,6 +87,8 @@
 import android.view.animation.AnimationUtils;
 import android.widget.ListView;
 import android.widget.TabWidget;
+
+import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.util.UserIcons;
 
 import java.io.IOException;
@@ -615,12 +617,10 @@
      * @return the managed profile id or UserHandle.USER_NULL if there is none.
      */
     public static int getManagedProfileId(UserManager um, int parentUserId) {
-        List<UserInfo> profiles = um.getProfiles(parentUserId);
-        int numProfiles = profiles.size();
-        for (int i = 0; i < numProfiles; ++i) {
-            UserInfo profile = profiles.get(i);
-            if (profile.id != parentUserId) {
-                return profile.id;
+        int[] profileIds = um.getProfileIdsWithDisabled(parentUserId);
+        for (int profileId : profileIds) {
+            if (profileId != parentUserId) {
+                return profileId;
             }
         }
         return UserHandle.USER_NULL;
@@ -1106,5 +1106,15 @@
         return Settings.Global.getInt(context.getContentResolver(),
                 Settings.Global.DEVICE_PROVISIONED, 0) != 0;
     }
+
+    public static boolean startQuiteModeDialogIfNecessary(Context context, UserManager um,
+            int userId) {
+        if (um.isQuietModeEnabled(UserHandle.of(userId))) {
+            final Intent intent = UnlaunchableAppActivity.createInQuietModeDialogIntent(userId);
+            context.startActivity(intent);
+            return true;
+        }
+        return false;
+    }
 }
 
diff --git a/src/com/android/settings/applications/AppStateSmsPremBridge.java b/src/com/android/settings/applications/AppStateSmsPremBridge.java
new file mode 100644
index 0000000..0fa7e50
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateSmsPremBridge.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import com.android.internal.telephony.ISms;
+import com.android.internal.telephony.SmsUsageMonitor;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.ArrayList;
+
+/**
+ * Connects the info provided by ApplicationsState and premium sms permission state.
+ */
+public class AppStateSmsPremBridge extends AppStateBaseBridge {
+
+    private final Context mContext;
+    private final ISms mSmsManager;
+
+    public AppStateSmsPremBridge(Context context, ApplicationsState appState, Callback callback) {
+        super(appState, callback);
+        mContext = context;
+        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        ArrayList<AppEntry> apps = mAppSession.getAllApps();
+        final int N = apps.size();
+        for (int i = 0; i < N; i++) {
+            AppEntry app = apps.get(i);
+            updateExtraInfo(app, app.info.packageName, app.info.uid);
+        }
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = getState(pkg);
+    }
+
+    public SmsState getState(String pkg) {
+        final SmsState state = new SmsState();
+        state.smsState = getSmsState(pkg);
+        return state;
+    }
+
+    private int getSmsState(String pkg) {
+        try {
+            return mSmsManager.getPremiumSmsPermission(pkg);
+        } catch (RemoteException e) {
+            return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+        }
+    }
+
+    public void setSmsState(String pkg, int state) {
+        try {
+            mSmsManager.setPremiumSmsPermission(pkg, state);
+        } catch (RemoteException e) {
+        }
+    }
+
+    public static class SmsState {
+        public int smsState;
+
+        public boolean isGranted() {
+            return smsState == SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW;
+        }
+    }
+
+    public static final AppFilter FILTER_APP_PREMIUM_SMS = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return info.extraInfo instanceof SmsState && ((SmsState) info.extraInfo).smsState
+                    != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 4f7e15a..9de3f7a 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -23,10 +23,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.icu.text.AlphabeticIndex;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.UserHandle;
-import android.os.UserManager;
+import android.os.*;
 import android.preference.PreferenceFrameLayout;
 import android.text.TextUtils;
 import android.util.ArraySet;
@@ -52,7 +49,7 @@
 import android.widget.Spinner;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.AppHeader;
-import com.android.settings.HelpUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Settings.AllApplicationsActivity;
@@ -1225,6 +1222,7 @@
         // TODO: Can probably hack together with less than full app state.
         private final ApplicationsState mAppState;
         private final ApplicationsState.Session mSession;
+        private final Handler mHandler;
 
         private SummaryProvider(Context context, SummaryLoader loader) {
             mContext = context;
@@ -1232,6 +1230,7 @@
             mAppState =
                     ApplicationsState.getInstance((Application) context.getApplicationContext());
             mSession = mAppState.newSession(this);
+            mHandler = new Handler(mAppState.getBackgroundLooper());
         }
 
         @Override
@@ -1248,6 +1247,16 @@
             mLoader.setSummary(this, mContext.getString(R.string.apps_summary, apps.size()));
         }
 
+        private void postRebuild() {
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                            null, false));
+                }
+            });
+        }
+
         @Override
         public void onRebuildComplete(ArrayList<AppEntry> apps) {
             updateSummary(apps);
@@ -1255,20 +1264,17 @@
 
         @Override
         public void onPackageListChanged() {
-            updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
-                    ApplicationsState.ALPHA_COMPARATOR));
+            postRebuild();
         }
 
         @Override
         public void onLauncherInfoChanged() {
-            updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
-                    ApplicationsState.ALPHA_COMPARATOR));
+            postRebuild();
         }
 
         @Override
         public void onLoadEntriesCompleted() {
-            updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
-                    ApplicationsState.ALPHA_COMPARATOR));
+            postRebuild();
         }
 
         @Override
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
index 7af967c..6fe966d 100644
--- a/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@ -60,8 +60,6 @@
         mContextPref.setOnPreferenceChangeListener(this);
 
         mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT);
-        mScreenshotPref.setChecked(Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
         mScreenshotPref.setOnPreferenceChangeListener(this);
 
         mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
@@ -134,9 +132,8 @@
         }
 
         mScreenshotPref.setEnabled(mContextPref.isChecked());
-        if (!mContextPref.isChecked()) {
-            mScreenshotPref.setChecked(false);
-        }
+        mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt(
+                getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
     }
 
     private boolean isCurrentAssistVoiceService() {
diff --git a/src/com/android/settings/applications/NotificationApps.java b/src/com/android/settings/applications/NotificationApps.java
index f76aa8d..b599eb6 100644
--- a/src/com/android/settings/applications/NotificationApps.java
+++ b/src/com/android/settings/applications/NotificationApps.java
@@ -17,6 +17,7 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
+import android.os.Handler;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateBaseBridge.Callback;
 import com.android.settings.dashboard.SummaryLoader;
@@ -44,6 +45,7 @@
         private final ApplicationsState.Session mSession;
         private final NotificationBackend mNotifBackend;
         private final AppStateNotificationBridge mExtraInfoBridge;
+        private final Handler mHandler;
 
         private SummaryProvider(Context context, SummaryLoader loader) {
             mContext = context;
@@ -54,6 +56,7 @@
             mNotifBackend = new NotificationBackend();
             mExtraInfoBridge = new AppStateNotificationBridge(mContext,
                     mAppState, this, mNotifBackend);
+            mHandler = new Handler(mAppState.getBackgroundLooper());
         }
 
         @Override
@@ -84,9 +87,14 @@
 
         @Override
         public void onExtraInfoUpdated() {
-            updateSummary(mSession.rebuild(
-                    AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
-                    ApplicationsState.ALPHA_COMPARATOR));
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    updateSummary(mSession.rebuild(
+                            AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
+                            null, false));
+                }
+            });
         }
 
         @Override
diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java
new file mode 100644
index 0000000..c4bb1a8
--- /dev/null
+++ b/src/com/android/settings/applications/PremiumSmsAccess.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.annotation.Nullable;
+import android.app.Application;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.View;
+import com.android.internal.logging.MetricsProto;
+import com.android.internal.telephony.SmsUsageMonitor;
+import com.android.settings.DividerPreference;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.applications.AppStateBaseBridge.Callback;
+import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
+import com.android.settings.notification.EmptyTextSettings;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.Callbacks;
+import com.android.settingslib.applications.ApplicationsState.Session;
+
+import java.util.ArrayList;
+
+public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Callbacks, OnPreferenceChangeListener {
+
+    private ApplicationsState mApplicationsState;
+    private AppStateSmsPremBridge mSmsBackend;
+    private Session mSession;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mApplicationsState = ApplicationsState.getInstance((Application)
+                getContext().getApplicationContext());
+        mSession = mApplicationsState.newSession(this);
+        mSmsBackend = new AppStateSmsPremBridge(getContext(), mApplicationsState, this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        setLoading(true, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSession.resume();
+        mSmsBackend.resume();
+    }
+
+    @Override
+    public void onPause() {
+        mSmsBackend.pause();
+        mSession.pause();
+        super.onPause();
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        PremiumSmsPreference pref = (PremiumSmsPreference) preference;
+        mSmsBackend.setSmsState(pref.mAppEntry.info.packageName,
+                Integer.parseInt((String) newValue));
+        return true;
+    }
+
+    private void updatePrefs(ArrayList<AppEntry> apps) {
+        if (apps == null) return;
+        setEmptyText(R.string.premium_sms_none);
+        setLoading(false, true);
+        final PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(
+                getPrefContext());
+        screen.setOrderingAsAdded(true);
+
+        for (int i = 0; i < apps.size(); i++) {
+            final PremiumSmsPreference smsPreference =
+                    new PremiumSmsPreference(apps.get(i), getPrefContext());
+            smsPreference.setOnPreferenceChangeListener(this);
+            screen.addPreference(smsPreference);
+        }
+        if (apps.size() != 0) {
+            DividerPreference summary = new DividerPreference(getPrefContext());
+            summary.setSelectable(false);
+            summary.setSummary(R.string.premium_sms_warning);
+            summary.setDividerAllowedAbove(true);
+            screen.addPreference(summary);
+        }
+
+        setPreferenceScreen(screen);
+    }
+
+    private void update() {
+        updatePrefs(mSession.rebuild(AppStateSmsPremBridge.FILTER_APP_PREMIUM_SMS,
+                ApplicationsState.ALPHA_COMPARATOR));
+    }
+
+    @Override
+    public void onExtraInfoUpdated() {
+        update();
+    }
+
+    @Override
+    public void onRebuildComplete(ArrayList<AppEntry> apps) {
+        updatePrefs(apps);
+    }
+
+    @Override
+    public void onRunningStateChanged(boolean running) {
+
+    }
+
+    @Override
+    public void onPackageListChanged() {
+
+    }
+
+    @Override
+    public void onPackageIconChanged() {
+
+    }
+
+    @Override
+    public void onPackageSizeChanged(String packageName) {
+
+    }
+
+    @Override
+    public void onAllSizesComputed() {
+
+    }
+
+    @Override
+    public void onLauncherInfoChanged() {
+
+    }
+
+    @Override
+    public void onLoadEntriesCompleted() {
+
+    }
+
+    private class PremiumSmsPreference extends DropDownPreference {
+        private final AppEntry mAppEntry;
+
+        public PremiumSmsPreference(AppEntry appEntry, Context context) {
+            super(context);
+            mAppEntry = appEntry;
+            mAppEntry.ensureLabel(context);
+            setTitle(mAppEntry.label);
+            if (mAppEntry.icon != null) {
+                setIcon(mAppEntry.icon);
+            }
+            setEntries(R.array.security_settings_premium_sms_values);
+            setEntryValues(new CharSequence[] {
+                    String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER),
+                    String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW),
+                    String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW),
+            });
+            setValue(String.valueOf(getCurrentValue()));
+            setSummary("%s");
+        }
+
+        private int getCurrentValue() {
+            return mAppEntry.extraInfo instanceof SmsState
+                    ? ((SmsState) mAppEntry.extraInfo).smsState
+                    : SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+        }
+
+        @Override
+        public void onBindViewHolder(PreferenceViewHolder holder) {
+            if (getIcon() == null) {
+                holder.itemView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mApplicationsState.ensureIcon(mAppEntry);
+                        setIcon(mAppEntry.icon);
+                    }
+                });
+            }
+            super.onBindViewHolder(holder);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index e565a61..cc46fba 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -518,7 +518,7 @@
         }
 
         private CharSequence getSummary() {
-            return mContext.getString(!mEnabled ? R.string.disabled
+            return mContext.getString(!mEnabled ? R.string.bluetooth_disabled
                     : mConnected ? R.string.bluetooth_connected
                     : R.string.bluetooth_disconnected);
         }
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 929179a..e6fcbcb 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -77,7 +77,6 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setAnimationAllowed(true);
 
         mLocalManager = Utils.getLocalBtManager(getActivity());
         if (mLocalManager == null) {
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 292244c..8b29273 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -85,6 +85,10 @@
         setShowingAll(true);
     }
 
+    public List<Tile> getSuggestions() {
+        return mSuggestions;
+    }
+
     public void setSuggestions(SuggestionParser suggestionParser) {
         mSuggestionParser = suggestionParser;
         mSuggestions = suggestionParser.getSuggestions();
diff --git a/src/com/android/settings/dashboard/DashboardDecorator.java b/src/com/android/settings/dashboard/DashboardDecorator.java
new file mode 100644
index 0000000..2e7afaf
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardDecorator.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.dashboard;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.State;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.View;
+import com.android.settings.R;
+
+public class DashboardDecorator extends RecyclerView.ItemDecoration {
+
+    private final Context mContext;
+    private final Drawable mDivider;
+
+    public DashboardDecorator(Context context) {
+        mContext = context;
+        TypedValue value = new TypedValue();
+        mContext.getTheme().resolveAttribute(android.R.attr.listDivider, value, true);
+        mDivider = mContext.getDrawable(value.resourceId);
+    }
+
+    @Override
+    public void onDrawOver(Canvas c, RecyclerView parent, State state) {
+        final int childCount = parent.getChildCount();
+        final int width = parent.getWidth();
+        final int bottom = parent.getBottom();
+        for (int i = 1; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            final ViewHolder holder = parent.getChildViewHolder(child);
+            if (holder.getItemViewType() == R.layout.dashboard_category) {
+                if (parent.getChildViewHolder(parent.getChildAt(i - 1)).getItemViewType()
+                        != R.layout.dashboard_tile) {
+                    continue;
+                }
+            } else if (holder.getItemViewType() != R.layout.condition_card) {
+                continue;
+            }
+
+            int top = getChildTop(child);
+            mDivider.setBounds(0, top, width, top + mDivider.getIntrinsicHeight());
+            mDivider.draw(c);
+        }
+    }
+
+    private int getChildTop(View child) {
+        final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                .getLayoutParams();
+        return child.getTop() + params.topMargin + Math.round(ViewCompat.getTranslationY(child));
+    }
+}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 5d9a79b..66b3730 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -27,7 +27,7 @@
 import android.view.ViewGroup;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.HelpUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Settings;
@@ -77,19 +77,19 @@
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        long startTime = System.currentTimeMillis();
         super.onCreate(savedInstanceState);
 
-        long startTime = System.currentTimeMillis();
         List<DashboardCategory> categories =
                 ((SettingsActivity) getActivity()).getDashboardCategories();
         mSummaryLoader = new SummaryLoader(getActivity(), categories);
         setHasOptionsMenu(true);
-        if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
-                + " ms");
         Context context = getContext();
         mConditionManager = ConditionManager.get(context);
         mSuggestionParser = new SuggestionParser(context,
                 context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
+        if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+                + " ms");
     }
 
     @Override
@@ -108,17 +108,22 @@
 
     @Override
     public void onResume() {
+        long startTime = System.currentTimeMillis();
         super.onResume();
 
         ((SettingsDrawerActivity) getActivity()).addCategoryListener(this);
         mSummaryLoader.setListening(true);
-        for (Condition c : mConditionManager.getVisibleConditions()) {
-            MetricsLogger.visible(getContext(), c.getMetricsConstant());
+        for (Condition c : mConditionManager.getConditions()) {
+            if (c.shouldShow()) {
+                MetricsLogger.visible(getContext(), c.getMetricsConstant());
+            }
         }
-        for (Tile suggestion : mSuggestionParser.getSuggestions()) {
+        for (Tile suggestion : mAdapter.getSuggestions()) {
             MetricsLogger.action(getContext(), MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                     DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion));
         }
+        if (DEBUG_TIMING) Log.d(TAG, "onResume took " + (System.currentTimeMillis() - startTime)
+                + " ms");
     }
 
     @Override
@@ -127,10 +132,12 @@
 
         ((SettingsDrawerActivity) getActivity()).remCategoryListener(this);
         mSummaryLoader.setListening(false);
-        for (Condition c : mConditionManager.getVisibleConditions()) {
-            MetricsLogger.hidden(getContext(), c.getMetricsConstant());
+        for (Condition c : mConditionManager.getConditions()) {
+            if (c.shouldShow()) {
+                MetricsLogger.hidden(getContext(), c.getMetricsConstant());
+            }
         }
-        for (Tile suggestion : mSuggestionParser.getSuggestions()) {
+        for (Tile suggestion : mAdapter.getSuggestions()) {
             MetricsLogger.action(getContext(), MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                     DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion));
         }
@@ -138,12 +145,15 @@
 
     @Override
     public void onWindowFocusChanged(boolean hasWindowFocus) {
+        long startTime = System.currentTimeMillis();
         if (hasWindowFocus) {
             mConditionManager.addListener(this);
             mConditionManager.refreshAll();
         } else {
             mConditionManager.remListener(this);
         }
+        if (DEBUG_TIMING) Log.d(TAG, "onWindowFocusChanged took "
+                + (System.currentTimeMillis() - startTime) + " ms");
     }
 
     @Override
@@ -161,6 +171,7 @@
 
     @Override
     public void onViewCreated(View view, Bundle bundle) {
+        long startTime = System.currentTimeMillis();
         mDashboard = (FocusRecyclerView) view.findViewById(R.id.dashboard_container);
         mLayoutManager = new LinearLayoutManager(getContext());
         mLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
@@ -171,12 +182,14 @@
         mDashboard.setLayoutManager(mLayoutManager);
         mDashboard.setHasFixedSize(true);
         mDashboard.setListener(this);
+        mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
         mAdapter = new DashboardAdapter(getContext());
         mAdapter.setConditions(mConditionManager.getConditions());
-        mAdapter.setSuggestions(mSuggestionParser);
         mDashboard.setAdapter(mAdapter);
         mSummaryLoader.setAdapter(mAdapter);
         ConditionAdapterUtils.addDismiss(mDashboard);
+        if (DEBUG_TIMING) Log.d(TAG, "onViewCreated took "
+                + (System.currentTimeMillis() - startTime) + " ms");
 
         rebuildUI();
     }
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 86cffde..55d97df 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -17,11 +17,8 @@
 
 import android.app.Activity;
 import android.content.ComponentName;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
+import android.os.*;
+import android.os.Process;
 import android.util.ArrayMap;
 import android.util.Log;
 import com.android.settings.SettingsActivity;
@@ -51,7 +48,7 @@
 
     public SummaryLoader(Activity activity, List<DashboardCategory> categories) {
         mHandler = new Handler();
-        mWorkerThread = new HandlerThread("SummaryLoader");
+        mWorkerThread = new HandlerThread("SummaryLoader", Process.THREAD_PRIORITY_BACKGROUND);
         mWorkerThread.start();
         mWorker = new Worker(mWorkerThread.getLooper());
         mActivity = activity;
diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java
index 4352f2d..1d48d5d 100644
--- a/src/com/android/settings/dashboard/conditional/Condition.java
+++ b/src/com/android/settings/dashboard/conditional/Condition.java
@@ -35,7 +35,8 @@
     private boolean mIsActive;
     private long mLastStateChange;
 
-    public Condition(ConditionManager manager) {
+    // All conditions must live in this package.
+    Condition(ConditionManager manager) {
         mManager = manager;
     }
 
@@ -45,10 +46,15 @@
         mLastStateChange = bundle.getLong(KEY_LAST_STATE);
     }
 
-    void saveState(PersistableBundle bundle) {
-        bundle.putBoolean(KEY_SILENCE, mIsSilenced);
-        bundle.putBoolean(KEY_ACTIVE, mIsActive);
-        bundle.putLong(KEY_LAST_STATE, mLastStateChange);
+    boolean saveState(PersistableBundle bundle) {
+        if (mIsSilenced) {
+            bundle.putBoolean(KEY_SILENCE, mIsSilenced);
+        }
+        if (mIsActive) {
+            bundle.putBoolean(KEY_ACTIVE, mIsActive);
+            bundle.putLong(KEY_LAST_STATE, mLastStateChange);
+        }
+        return mIsSilenced || mIsActive;
     }
 
     protected void notifyChanged() {
diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java
index cd044ac..24d5f09 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionManager.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionManager.java
@@ -38,10 +38,12 @@
 
     private static final boolean DEBUG = true;
 
+    private static final String PKG = "com.android.settings.dashboard.conditional.";
+
     private static final String FILE_NAME = "condition_state.xml";
-    private static final String TAG_CONDITIONS = "conditions";
-    private static final String TAG_CONDITION = "condition";
-    private static final String ATTR_CLASS = "class";
+    private static final String TAG_CONDITIONS = "cs";
+    private static final String TAG_CONDITION = "c";
+    private static final String ATTR_CLASS = "cls";
 
     private static ConditionManager sInstance;
 
@@ -80,6 +82,9 @@
                 if (TAG_CONDITION.equals(parser.getName())) {
                     int depth = parser.getDepth();
                     String clz = parser.getAttributeValue("", ATTR_CLASS);
+                    if (!clz.startsWith(PKG)) {
+                        clz = PKG + clz;
+                    }
                     Condition condition = createCondition(Class.forName(clz));
                     PersistableBundle bundle = PersistableBundle.restoreFromXml(parser);
                     if (DEBUG) Log.d(TAG, "Reading " + clz + " -- " + bundle);
@@ -109,12 +114,14 @@
 
             final int N = mConditions.size();
             for (int i = 0; i < N; i++) {
-                serializer.startTag("", TAG_CONDITION);
-                serializer.attribute("", ATTR_CLASS, mConditions.get(i).getClass().getName());
                 PersistableBundle bundle = new PersistableBundle();
-                mConditions.get(i).saveState(bundle);
-                bundle.saveToXml(serializer);
-                serializer.endTag("", TAG_CONDITION);
+                if (mConditions.get(i).saveState(bundle)) {
+                    serializer.startTag("", TAG_CONDITION);
+                    final String clz = mConditions.get(i).getClass().getSimpleName();
+                    serializer.attribute("", ATTR_CLASS, clz);
+                    bundle.saveToXml(serializer);
+                    serializer.endTag("", TAG_CONDITION);
+                }
             }
 
             serializer.endTag("", TAG_CONDITIONS);
@@ -133,6 +140,7 @@
         addIfMissing(CellularDataCondition.class);
         addIfMissing(BackgroundDataCondition.class);
         addIfMissing(WorkModeCondition.class);
+        Collections.sort(mConditions, CONDITION_COMPARATOR);
     }
 
     private void addIfMissing(Class<? extends Condition> clz) {
@@ -187,12 +195,12 @@
                 conditions.add(mConditions.get(i));
             }
         }
-        Collections.sort(conditions, CONDITION_COMPARATOR);
         return conditions;
     }
 
     public void notifyChanged(Condition condition) {
         saveToXml();
+        Collections.sort(mConditions, CONDITION_COMPARATOR);
         final int N = mListeners.size();
         for (int i = 0; i < N; i++) {
             mListeners.get(i).onConditionsChanged();
@@ -209,7 +217,7 @@
 
     public static ConditionManager get(Context context) {
         if (sInstance == null) {
-            sInstance = new ConditionManager(context);
+            sInstance = new ConditionManager(context.getApplicationContext());
         }
         return sInstance;
     }
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 11b100c..b3c8e03 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -20,6 +20,7 @@
 import android.content.Loader;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.net.INetworkStatsSession;
 import android.net.NetworkPolicy;
@@ -30,6 +31,7 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
@@ -42,8 +44,10 @@
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settingslib.AppItem;
+import com.android.settingslib.Utils;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
+import com.android.settingslib.net.UidDetailProvider;
 
 import static android.net.NetworkPolicyManager.POLICY_NONE;
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
@@ -123,15 +127,6 @@
                 addUid(mAppItem.uids.keyAt(i));
             }
         }
-        if (mPackages.size() != 0) {
-            PackageManager pm = getPackageManager();
-            try {
-                ApplicationInfo info = pm.getApplicationInfo(mPackages.valueAt(0), 0);
-                mIcon = info.loadIcon(pm);
-                mLabel = info.loadLabel(pm);
-            } catch (PackageManager.NameNotFoundException e) {
-            }
-        }
         addPreferencesFromResource(R.xml.app_data_usage);
 
         mTotalUsage = findPreference(KEY_TOTAL_USAGE);
@@ -142,6 +137,15 @@
         mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener, false);
 
         if (UserHandle.isApp(mAppItem.key)) {
+            if (mPackages.size() != 0) {
+                PackageManager pm = getPackageManager();
+                try {
+                    ApplicationInfo info = pm.getApplicationInfo(mPackages.valueAt(0), 0);
+                    mIcon = info.loadIcon(pm);
+                    mLabel = info.loadLabel(pm);
+                } catch (PackageManager.NameNotFoundException e) {
+                }
+            }
             mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
             mRestrictBackground.setOnPreferenceChangeListener(this);
             mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
@@ -176,6 +180,12 @@
                 removePreference(KEY_APP_LIST);
             }
         } else {
+            final int userId = UidDetailProvider.getUserIdForKey(mAppItem.key);
+            final UserManager um = UserManager.get(getActivity());
+            final UserInfo info = um.getUserInfo(userId);
+            final PackageManager pm = getPackageManager();
+            mIcon = Utils.getUserIcon(getActivity(), um, info);
+            mLabel = Utils.getUserLabel(getActivity(), info);
             removePreference(KEY_UNRESTRICTED_DATA);
             removePreference(KEY_APP_SETTINGS);
             removePreference(KEY_RESTRICT_BACKGROUND);
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index e3771d3..c9014c0 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -28,6 +28,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.AppStateBaseBridge;
+import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -215,8 +216,8 @@
             mEntry = entry;
             mEntry.ensureLabel(getContext());
             setTitle(entry.label);
-            setChecked(((AppStateDataUsageBridge.DataUsageState) entry.extraInfo)
-                    .isDataSaverWhitelisted);
+            final DataUsageState state = (DataUsageState) entry.extraInfo;
+            setChecked(state != null && state.isDataSaverWhitelisted);
             if (mEntry.icon != null) {
                 setIcon(mEntry.icon);
             }
@@ -224,8 +225,8 @@
 
         public void reuse() {
             setTitle(mEntry.label);
-            setChecked(((AppStateDataUsageBridge.DataUsageState) mEntry.extraInfo)
-                    .isDataSaverWhitelisted);
+            final DataUsageState state = (DataUsageState) mEntry.extraInfo;
+            setChecked(state != null && state.isDataSaverWhitelisted);
         }
 
         @Override
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index a19b5b8..5f5975d 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -725,11 +725,16 @@
                 public void onClick(DialogInterface dialog, int which) {
                     final PrivateVolumeSettings target = (PrivateVolumeSettings) getTargetFragment();
                     final PackageManager pm = context.getPackageManager();
-                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
-                    final ClearCacheObserver observer = new ClearCacheObserver(
-                            target, infos.size());
-                    for (PackageInfo info : infos) {
-                        pm.deleteApplicationCacheFiles(info.packageName, observer);
+                    final UserManager um = context.getSystemService(UserManager.class);
+
+                    for (int userId : um.getProfileIdsWithDisabled(context.getUserId())) {
+                        final List<PackageInfo> infos = pm.getInstalledPackagesAsUser(0, userId);
+                        final ClearCacheObserver observer = new ClearCacheObserver(
+                                target, infos.size());
+                        for (PackageInfo info : infos) {
+                            pm.deleteApplicationCacheFilesAsUser(info.packageName, userId,
+                                    observer);
+                        }
                     }
                 }
             });
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 277f59f..9774db9 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -478,6 +478,9 @@
                     continue;
                 }
                 final File path = info.getPath();
+                if (path == null) {
+                    continue;
+                }
                 privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
                 privateTotalBytes += path.getTotalSpace();
             }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 5be9865..d1bd3f7 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -24,6 +24,7 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -35,7 +36,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.HelpUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settings.R;
 import com.android.setupwizardlib.SetupWizardRecyclerLayout;
 import com.android.setupwizardlib.items.IItem;
@@ -52,6 +53,7 @@
     protected static final int FINGERPRINT_FIND_SENSOR_REQUEST = 2;
     protected static final int LEARN_MORE_REQUEST = 3;
 
+    private UserManager mUserManager;
     private boolean mHasPassword;
 
     @Override
@@ -61,6 +63,7 @@
         setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
         final SetupWizardRecyclerLayout layout =
                 (SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);
+        mUserManager = UserManager.get(this);
         final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
         adapter.setOnItemSelectedListener(this);
         Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message);
@@ -76,7 +79,7 @@
 
     private void updatePasswordQuality() {
         final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
-                .getActivePasswordQuality(mUserId);
+                .getActivePasswordQuality(mUserManager.getCredentialOwnerProfile(mUserId));
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
     }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 3b00168..3b83e48 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -40,6 +40,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
@@ -63,7 +64,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.HelpUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SubSettings;
@@ -808,7 +809,7 @@
         }
     }
 
-    public static Preference getFingerprintPreferenceForUser(Context context, int userId) {
+    public static Preference getFingerprintPreferenceForUser(Context context, final int userId) {
         FingerprintManager fpm = (FingerprintManager) context.getSystemService(
                 Context.FINGERPRINT_SERVICE);
         if (fpm == null || !fpm.isHardwareDetected()) {
@@ -818,7 +819,6 @@
         Preference fingerprintPreference = new Preference(context);
         fingerprintPreference.setKey(KEY_FINGERPRINT_SETTINGS);
         fingerprintPreference.setTitle(R.string.security_settings_fingerprint_preference_title);
-        Intent intent = new Intent();
         final List<Fingerprint> items = fpm.getEnrolledFingerprints(userId);
         final int fingerprintCount = items != null ? items.size() : 0;
         final String clazz;
@@ -832,9 +832,22 @@
                     R.string.security_settings_fingerprint_preference_summary_none);
             clazz = FingerprintEnrollIntroduction.class.getName();
         }
-        intent.setClassName("com.android.settings", clazz);
-        intent.putExtra(Intent.EXTRA_USER_ID, userId);
-        fingerprintPreference.setIntent(intent);
+        fingerprintPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                final Context context = preference.getContext();
+                final UserManager userManager = UserManager.get(context);
+                if (Utils.startQuiteModeDialogIfNecessary(context, userManager,
+                        userId)) {
+                    return false;
+                }
+                Intent intent = new Intent();
+                intent.setClassName("com.android.settings", clazz);
+                intent.putExtra(Intent.EXTRA_USER_ID, userId);
+                context.startActivity(intent);
+                return true;
+            }
+        });
         return fingerprintPreference;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 25d5292..e79f8ff 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -75,6 +75,7 @@
         mCpuParser = new BatteryFlagParser(accentColor, false,
                 HistoryItem.STATE_CPU_RUNNING_FLAG);
         mPhoneParser = new BatteryCellParser();
+        setHasOptionsMenu(true);
     }
     
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index ba93f98..0f36ab1 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -76,6 +76,7 @@
         ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
         ((TextView) view.findViewById(R.id.estimation)).setText(mBatteryInfo.remainingLabel);
         UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
+        usageView.findViewById(R.id.label_group).setAlpha(.7f);
         mBatteryInfo.bindHistory(usageView);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 60b6dc5..79ce204 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -279,7 +279,6 @@
 
     protected void refreshStats() {
         super.refreshStats();
-        PowerWhitelistBackend powerWhiteist = PowerWhitelistBackend.getInstance();
         updatePreference(mHistPref);
         cacheRemoveAllPrefs(mAppListGroup);
         mAppListGroup.setOrderingAsAdded(false);
@@ -360,12 +359,6 @@
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
                 pref.setPercent(percentOfMax, percentOfTotal);
-                if (sipper.drainType == DrainType.APP) {
-                    pref.setSummary(powerWhiteist.isWhitelisted(entry.defaultPackageName)
-                            || powerWhiteist.isSysWhitelisted(entry.defaultPackageName)
-                            ? getString(R.string.not_battery_optimizing)
-                            : null);
-                }
                 if (sipper.uidObj != null) {
                     pref.setKey(Integer.toString(sipper.uidObj.getUid()));
                 }
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
index f35d6bf..6916242 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
@@ -146,6 +146,7 @@
         for (KeyboardLayout layout : mKeyboardLayouts) {
             Preference pref = new Preference(getPrefContext());
             pref.setTitle(layout.getLabel());
+            pref.setSummary(layout.getCollection());
             root.addPreference(pref);
             mPreferenceMap.put(pref, layout);
         }
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 7f590a1..fb44a3d 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -61,6 +61,7 @@
     private static final int USER_SYSTEM = 0;
     private static final String KEYBOARD_ASSISTANCE_CATEGORY = "keyboard_assistance_category";
     private static final String SHOW_VIRTUAL_KEYBOARD_SWITCH = "show_virtual_keyboard_switch";
+    private static final String KEYBOARD_SHORTCUTS_HELPER = "keyboard_shortcuts_helper";
     private static final String IM_SUBTYPE_MODE_KEYBOARD = "keyboard";
 
     @NonNull
@@ -95,6 +96,14 @@
         mShowVirtualKeyboardSwitch = Preconditions.checkNotNull(
                 (SwitchPreference) mKeyboardAssistanceCategory.findPreference(
                         SHOW_VIRTUAL_KEYBOARD_SWITCH));
+        findPreference(KEYBOARD_SHORTCUTS_HELPER).setOnPreferenceClickListener(
+                new Preference.OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        toggleKeyboardShortcutsMenu();
+                        return true;
+                    }
+                });
     }
 
     @Override
@@ -245,6 +254,10 @@
         mShowVirtualKeyboardSwitch.setChecked(mSettings.isShowImeWithHardKeyboardEnabled());
     }
 
+    private void toggleKeyboardShortcutsMenu() {
+        getActivity().requestKeyboardShortcutsHelper();
+    }
+
     private final OnPreferenceChangeListener mShowVirtualKeyboardSwitchPreferenceChangeListener =
             new OnPreferenceChangeListener() {
                 @Override
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index dfdf0dc..cc4c4af 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -30,7 +30,7 @@
 import android.widget.Switch;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.HelpUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index f8ac7dd..4d50461 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -75,9 +75,14 @@
         mContext = getActivity();
         mProfileChallengeUserId = Utils.getManagedProfileId(
                 UserManager.get(mContext), UserHandle.myUserId());
-        mSecure = new LockPatternUtils(getActivity()).isSecure(UserHandle.myUserId());
+
+        final LockPatternUtils utils = new LockPatternUtils(getActivity());
+        final boolean isUnified =
+                !utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId);
+
+        mSecure = utils.isSecure(UserHandle.myUserId());
         mSecureProfile = (mProfileChallengeUserId != UserHandle.USER_NULL)
-                && new LockPatternUtils(getActivity()).isSecure(mProfileChallengeUserId);
+                && (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure));
 
         addPreferencesFromResource(R.xml.configure_notification_settings);
 
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index 75acdc3..3ae1b63 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -20,14 +20,12 @@
 import android.app.INotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.IntentSender;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.*;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.NotificationListenerService.Ranking;
@@ -36,7 +34,6 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.support.v7.widget.RecyclerView;
-import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -62,6 +59,7 @@
     private static final boolean DEBUG = false;
     private static final boolean DUMP_EXTRAS = true;
     private static final boolean DUMP_PARCEL = true;
+    private Handler mHandler;
 
     private static class HistoricalNotificationInfo {
         public String pkg;
@@ -90,32 +88,44 @@
     private final NotificationListenerService mListener = new NotificationListenerService() {
         @Override
         public void onNotificationPosted(StatusBarNotification sbn, RankingMap ranking) {
-            logd("onNotificationPosted: %s", sbn.getNotification());
-            final Handler h = getListView().getHandler();
+            logd("onNotificationPosted: %s, with update for %d", sbn.getNotification(),
+                    ranking == null ? 0 : ranking.getOrderedKeys().length);
             mRanking = ranking;
-            h.removeCallbacks(mRefreshListRunnable);
-            h.postDelayed(mRefreshListRunnable, 100);
+            scheduleRefreshList();
         }
 
         @Override
         public void onNotificationRemoved(StatusBarNotification notification, RankingMap ranking) {
-            final Handler h = getListView().getHandler();
+            logd("onNotificationRankingUpdate with update for %d",
+                    ranking == null ? 0 : ranking.getOrderedKeys().length);
             mRanking = ranking;
-            h.removeCallbacks(mRefreshListRunnable);
-            h.postDelayed(mRefreshListRunnable, 100);
+            scheduleRefreshList();
         }
 
         @Override
         public void onNotificationRankingUpdate(RankingMap ranking) {
+            logd("onNotificationRankingUpdate with update for %d",
+                    ranking == null ? 0 : ranking.getOrderedKeys().length);
             mRanking = ranking;
+            scheduleRefreshList();
         }
 
         @Override
         public void onListenerConnected() {
             mRanking = getCurrentRanking();
+            logd("onListenerConnected with update for %d",
+                    mRanking == null ? 0 : mRanking.getOrderedKeys().length);
+            scheduleRefreshList();
         }
     };
 
+    private void scheduleRefreshList() {
+        if (mHandler != null) {
+            mHandler.removeCallbacks(mRefreshListRunnable);
+            mHandler.postDelayed(mRefreshListRunnable, 100);
+        }
+    }
+
     private Context mContext;
 
     private final Comparator<HistoricalNotificationInfo> mNotificationSorter
@@ -131,6 +141,7 @@
     public void onAttach(Activity activity) {
         logd("onAttach(%s)", activity.getClass().getSimpleName());
         super.onAttach(activity);
+        mHandler = new Handler(activity.getMainLooper());
         mContext = activity;
         mPm = mContext.getPackageManager();
         mNoMan = INotificationManager.Stub.asInterface(
@@ -138,6 +149,14 @@
     }
 
     @Override
+    public void onDetach() {
+        logd("onDetach()");
+        mHandler.removeCallbacks(mRefreshListRunnable);
+        mHandler = null;
+        super.onDetach();
+    }
+
+    @Override
     public void onPause() {
         try {
             mListener.unregisterAsSystemService();
@@ -280,11 +299,11 @@
                             .append(bold(getString(R.string.notification_log_details_icon)))
                             .append(delim)
                             .append(n.getSmallIcon().toString());
-                    if (!TextUtils.isEmpty(n.getGroup())) {
+                    if (sbn.isGroup()) {
                         sb.append("\n")
                                 .append(bold(getString(R.string.notification_log_details_group)))
                                 .append(delim)
-                                .append(n.getGroup());
+                                .append(sbn.getGroupKey());
                         if (n.isGroupSummary()) {
                             sb.append(bold(
                                     getString(R.string.notification_log_details_group_summary)));
@@ -328,18 +347,31 @@
                             .append(bold(getString(R.string.notification_log_details_priority)))
                             .append(delim)
                             .append(Notification.priorityToString(n.priority));
-                    if (mRanking != null && mRanking.getRanking(sbn.getKey(), rank)) {
-                        sb.append("\n")
-                                .append(bold(getString(
-                                        R.string.notification_log_details_importance)))
-                                .append(delim)
-                                .append(Ranking.importanceToString(rank.getImportance()));
-                        if (rank.getImportanceExplanation() != null) {
+                    if (resultset == active) {
+                        // mRanking only applies to active notifications
+                        if (mRanking != null && mRanking.getRanking(sbn.getKey(), rank)) {
                             sb.append("\n")
                                     .append(bold(getString(
-                                            R.string.notification_log_details_explanation)))
+                                            R.string.notification_log_details_importance)))
                                     .append(delim)
-                                    .append(rank.getImportanceExplanation());
+                                    .append(Ranking.importanceToString(rank.getImportance()));
+                            if (rank.getImportanceExplanation() != null) {
+                                sb.append("\n")
+                                        .append(bold(getString(
+                                                R.string.notification_log_details_explanation)))
+                                        .append(delim)
+                                        .append(rank.getImportanceExplanation());
+                            }
+                        } else {
+                            if (mRanking == null) {
+                                sb.append("\n")
+                                        .append(bold(getString(
+                                                R.string.notification_log_details_ranking_null)));
+                            } else {
+                                sb.append("\n")
+                                        .append(bold(getString(
+                                                R.string.notification_log_details_ranking_none)));
+                            }
                         }
                     }
                     if (n.contentIntent != null) {
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index e783923..ece3913 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -164,10 +164,11 @@
 
         if (sir != null) {
             simPref.setSummary(sir.getDisplayName());
+            simPref.setEnabled(mSelectableSubInfos.size() > 1);
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
+            simPref.setEnabled(mSelectableSubInfos.size() >= 1);
         }
-        simPref.setEnabled(mSelectableSubInfos.size() >= 1);
     }
 
     private void updateCellularDataValues() {
@@ -176,17 +177,18 @@
         simPref.setTitle(R.string.cellular_data_title);
         if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
 
-        if (sir != null) {
-            simPref.setSummary(sir.getDisplayName());
-        } else if (sir == null) {
-            simPref.setSummary(R.string.sim_selection_required_pref);
-        }
-
         boolean callStateIdle = isCallStateIdle();
         final boolean ecbMode = SystemProperties.getBoolean(
                 TelephonyProperties.PROPERTY_INECM_MODE, false);
-        // Enable data preference in msim mode and call state idle
-        simPref.setEnabled((mSelectableSubInfos.size() >= 1) && callStateIdle && !ecbMode);
+        if (sir != null) {
+            simPref.setSummary(sir.getDisplayName());
+            // Enable data preference in msim mode and call state idle
+            simPref.setEnabled((mSelectableSubInfos.size() > 1) && callStateIdle && !ecbMode);
+        } else if (sir == null) {
+            simPref.setSummary(R.string.sim_selection_required_pref);
+            // Enable data preference in msim mode and call state idle
+            simPref.setEnabled((mSelectableSubInfos.size() >= 1) && callStateIdle && !ecbMode);
+        }
     }
 
     private void updateCallValues() {
diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java
index 00df09c..bf6983e 100644
--- a/src/com/android/settings/widget/LabeledSeekBar.java
+++ b/src/com/android/settings/widget/LabeledSeekBar.java
@@ -24,12 +24,10 @@
 import android.support.v4.widget.ExploreByTouchHelper;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
-import android.widget.SeekBar.OnSeekBarChangeListener;
 
 import java.util.List;
 
@@ -40,9 +38,90 @@
  */
 public class LabeledSeekBar extends SeekBar {
 
+    private final ExploreByTouchHelper mAccessHelper;
+
+    /** Seek bar change listener set via public method. */
+    private OnSeekBarChangeListener mOnSeekBarChangeListener;
+
+    /** Labels for discrete progress values. */
+    private String[] mLabels;
+
+    public LabeledSeekBar(Context context, AttributeSet attrs) {
+        this(context, attrs, com.android.internal.R.attr.seekBarStyle);
+    }
+
+    public LabeledSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public LabeledSeekBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        mAccessHelper = new LabeledSeekBarExploreByTouchHelper(this);
+        ViewCompat.setAccessibilityDelegate(this, mAccessHelper);
+
+        super.setOnSeekBarChangeListener(mProxySeekBarListener);
+    }
+
+    @Override
+    public synchronized void setProgress(int progress) {
+        // This method gets called from the constructor, so mAccessHelper may
+        // not have been assigned yet.
+        if (mAccessHelper != null) {
+            mAccessHelper.invalidateRoot();
+        }
+
+        super.setProgress(progress);
+    }
+
+    public void setLabels(String[] labels) {
+        mLabels = labels;
+    }
+
+    @Override
+    public void setOnSeekBarChangeListener(OnSeekBarChangeListener l) {
+        // The callback set in the constructor will proxy calls to this
+        // listener.
+        mOnSeekBarChangeListener = l;
+    }
+
+    @Override
+    protected boolean dispatchHoverEvent(MotionEvent event) {
+        return mAccessHelper.dispatchHoverEvent(event) || super.dispatchHoverEvent(event);
+    }
+
+    private void sendClickEventForAccessibility(int progress) {
+        mAccessHelper.invalidateRoot();
+        mAccessHelper.sendEventForVirtualView(progress, AccessibilityEvent.TYPE_VIEW_CLICKED);
+    }
+
+    private final OnSeekBarChangeListener mProxySeekBarListener = new OnSeekBarChangeListener() {
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            if (mOnSeekBarChangeListener != null) {
+                mOnSeekBarChangeListener.onStopTrackingTouch(seekBar);
+            }
+        }
+
+        @Override
+        public void onStartTrackingTouch(SeekBar seekBar) {
+            if (mOnSeekBarChangeListener != null) {
+                mOnSeekBarChangeListener.onStartTrackingTouch(seekBar);
+            }
+        }
+
+        @Override
+        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+            if (mOnSeekBarChangeListener != null) {
+                mOnSeekBarChangeListener.onProgressChanged(seekBar, progress, fromUser);
+                sendClickEventForAccessibility(progress);
+            }
+        }
+    };
+
     private class LabeledSeekBarExploreByTouchHelper extends ExploreByTouchHelper {
 
-        public LabeledSeekBarExploreByTouchHelper(View forView) {
+        public LabeledSeekBarExploreByTouchHelper(LabeledSeekBar forView) {
             super(forView);
         }
 
@@ -134,125 +213,4 @@
             return r;
         }
     }
-
-    private String[] mLabels;
-
-    private ExploreByTouchHelper mAccessHelper;
-
-    private boolean mOnMeasureCalled;
-    private boolean mOnAttachedWindowCalled;
-
-    public LabeledSeekBar(Context context, AttributeSet attrs) {
-        this(context, attrs, com.android.internal.R.attr.seekBarStyle);
-    }
-
-    public LabeledSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    public LabeledSeekBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        super.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                // Do nothing
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-                // Do nothing
-            }
-
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                sendClickEventForAccessibility(progress);
-            }
-        });
-    }
-
-    @Override
-    public synchronized void setProgress(int progress) {
-        if (mAccessHelper != null) {
-            mAccessHelper.invalidateRoot();
-        }
-
-        super.setProgress(progress);
-    }
-
-    public void setLabels(String[] labels) {
-        mLabels = labels;
-    }
-
-    @Override
-    public void setOnSeekBarChangeListener(final OnSeekBarChangeListener l) {
-        // Tweak the listener to send accessibility event on progress changed.
-        OnSeekBarChangeListener l2 = new OnSeekBarChangeListener() {
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                l.onStopTrackingTouch(seekBar);
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-                l.onStartTrackingTouch(seekBar);
-            }
-
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                l.onProgressChanged(seekBar, progress, fromUser);
-                sendClickEventForAccessibility(progress);
-            }
-        };
-
-        super.setOnSeekBarChangeListener(l2);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        mOnMeasureCalled = true;
-        tryInitAccessHelper();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mOnAttachedWindowCalled = true;
-        tryInitAccessHelper();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        ViewCompat.setAccessibilityDelegate(this, null);
-        mAccessHelper = null;
-        super.onDetachedFromWindow();
-    }
-
-    @Override
-    protected boolean dispatchHoverEvent(MotionEvent event) {
-        if (mAccessHelper != null && mAccessHelper.dispatchHoverEvent(event)) {
-            return true;
-        }
-
-        return super.dispatchHoverEvent(event);
-    }
-
-    /**
-     * Initialize accessibility delegation only when both onAttachedWindow and onMeasure
-     * has been called.
-     */
-    private void tryInitAccessHelper() {
-        if (mOnAttachedWindowCalled && mOnMeasureCalled) {
-            mAccessHelper = new LabeledSeekBarExploreByTouchHelper(this);
-            ViewCompat.setAccessibilityDelegate(this, mAccessHelper);
-            mOnAttachedWindowCalled = mOnMeasureCalled = false;
-        }
-    }
-
-    private void sendClickEventForAccessibility(int progress) {
-        if (mAccessHelper != null) {
-            mAccessHelper.invalidateRoot();
-            mAccessHelper.sendEventForVirtualView(progress, AccessibilityEvent.TYPE_VIEW_CLICKED);
-        }
-    }
 }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 17cc3b6..08e27ec 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -984,7 +984,7 @@
 
         private CharSequence getSummary() {
             if (!mWifiTracker.enabled) {
-                return mContext.getString(R.string.disabled);
+                return mContext.getString(R.string.wifi_disabled_generic);
             }
             if (!mWifiTracker.connected) {
                 return mContext.getString(R.string.disconnected);