diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ef5caf..b3db932 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -122,38 +122,6 @@
             <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity-alias>
 
-        <activity android:name=".Settings$WirelessSettings"
-            android:label="@string/header_category_wireless_networks">
-            <intent-filter android:priority="4">
-                <action android:name="com.android.settings.category.wireless" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".Settings$DeviceSettings"
-            android:label="@string/header_category_device">
-            <intent-filter android:priority="3">
-                <action android:name="com.android.settings.category.device" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".Settings$PersonalSettings"
-            android:label="@string/header_category_personal">
-            <intent-filter android:priority="2">
-                <action android:name="com.android.settings.category.personal" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".SystemSettings"
-            android:label="@string/header_category_system">
-            <intent-filter android:priority="1">
-                <action android:name="com.android.settings.category.system" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <receiver android:name=".SettingsInitialize">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
@@ -179,7 +147,7 @@
         <activity android:name=".Settings$NetworkDashboardActivity"
             android:taskAffinity="com.android.settings"
             android:label="@string/network_dashboard_title"
-            android:icon="@drawable/ic_dashboard_network"
+            android:icon="@drawable/ic_settings_wireless"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -265,11 +233,6 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="4">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -440,11 +403,6 @@
                 <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="3">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.bluetooth.BluetoothSettings" />
         </activity>
@@ -916,7 +874,7 @@
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
-                android:icon="@drawable/ic_dashboard_display"
+                android:icon="@drawable/ic_settings_display"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -1020,11 +978,11 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="6">
+            <intent-filter android:priority="200">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.apps" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1039,8 +997,6 @@
                 <action android:name="android.settings.MANAGE_DOMAIN_URLS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.applications.ManageDomainUrls" />
         </activity>
@@ -1069,8 +1025,6 @@
                 <action android:name="android.settings.APP_MEMORY_USAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.applications.ProcessStatsUi" />
         </activity>
@@ -1285,11 +1239,6 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="3">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.personal" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.location.LocationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1298,7 +1247,7 @@
 
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
-                android:icon="@drawable/ic_dashboard_security"
+                android:icon="@drawable/ic_settings_security"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
                 android:parentActivityName="Settings">
@@ -1500,8 +1449,6 @@
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1814,8 +1761,8 @@
                 android:value="com.android.settings.deviceinfo.ImeiInformation" />
         </activity>
 
-        <activity android:name="Settings$StorageSettingsActivity"
-                android:label="@string/storage_settings_title"
+        <activity android:name=".Settings$StorageDashboardActivity"
+                android:label="@string/storage_settings"
                 android:icon="@drawable/ic_settings_storage"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
@@ -1833,7 +1780,7 @@
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/storage_usb_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1845,7 +1792,7 @@
         <activity android:name="Settings$PrivateVolumeSettingsActivity"
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageSettingsActivity">
+                android:parentActivityName="Settings$StorageDashboardActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />
         </activity>
@@ -1853,7 +1800,7 @@
         <activity android:name="Settings$PublicVolumeSettingsActivity"
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageSettingsActivity">
+                android:parentActivityName="Settings$StorageDashboardActivity">
             <intent-filter>
                 <action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1869,7 +1816,7 @@
         <activity android:name="Settings$PrivateVolumeForgetActivity"
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageSettingsActivity"
+                android:parentActivityName="Settings$StorageDashboardActivity"
                 android:exported="true"
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2443,11 +2390,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="2">
+            <intent-filter android:priority="8">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.accounts" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.users.UserSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2466,11 +2413,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="1">
+            <intent-filter android:priority="10">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.apps.default" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.nfc.PaymentSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2631,14 +2578,14 @@
         <!-- Show apps for which application-level notification settings are applicable -->
         <activity android:name="Settings$NotificationAppListActivity"
                 android:label="@string/app_notifications_title"
-                android:icon="@drawable/ic_settings_notifications"
+                android:icon="@drawable/ic_notifications"
                 android:exported="true"
                 android:taskAffinity="">
-            <intent-filter android:priority="8">
+            <intent-filter android:priority="150">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.device" />
+                       android:value="com.android.settings.category.ia.apps" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.NotificationApps" />
         </activity>
@@ -2989,7 +2936,7 @@
         <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
         <activity android:name=".Settings$AppAndNotificationDashboardActivity"
                   android:label="@string/app_and_notification_dashboard_title"
-                  android:icon="@drawable/ic_dashboard_apps">
+                  android:icon="@drawable/ic_apps">
             <intent-filter android:priority="9">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3001,23 +2948,9 @@
                        android:value="@string/app_and_notification_dashboard_summary"/>
         </activity>
 
-        <activity android:name=".Settings$StorageDashboardActivity"
-                  android:label="@string/storage_settings"
-                  android:icon="@drawable/ic_dashboard_storage">
-            <intent-filter android:priority="5">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.deviceinfo.StorageSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity>
-
         <activity android:name=".Settings$UserAndAccountDashboardActivity"
                   android:label="@string/account_dashboard_title"
-                  android:icon="@drawable/ic_dashboard_user">
+                  android:icon="@drawable/ic_settings_accounts">
             <intent-filter android:priority="3">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3035,7 +2968,7 @@
 
         <activity android:name=".Settings$SystemDashboardActivity"
                   android:label="@string/header_category_system"
-                  android:icon="@drawable/ic_dashboard_system">
+                  android:icon="@drawable/ic_settings_about">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3062,32 +2995,6 @@
                        android:resource="@string/support_summary"/>
         </activity>
 
-        <activity-alias android:name="ManageApplicationsDashboardAlias"
-                        android:targetActivity="Settings$ManageApplicationsActivity">
-            <intent-filter android:priority="200">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.apps" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
-        <activity-alias android:name="AppNotificationDashboardAlias"
-                        android:targetActivity="Settings$NotificationAppListActivity"
-                        android:icon="@drawable/ic_notifications">
-            <intent-filter android:priority="150">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.apps"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.NotificationApps"/>
-
-        </activity-alias>
-
         <activity-alias android:name="ConfigureNotificationDashboardAlias"
                   android:targetActivity="Settings$ConfigureNotificationSettingsActivity">
             <intent-filter android:priority="120">
@@ -3101,19 +3008,6 @@
                        android:value="true" />
         </activity-alias>
 
-        <activity-alias android:name="UsersDashboardAlias"
-                        android:targetActivity="Settings$UserSettingsActivity">
-            <intent-filter android:priority="8">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.users.UserSettings" />
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.accounts" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
         <activity-alias android:name="AppDefaultDashboardAlias"
                         android:targetActivity="Settings$AdvancedAppsActivity"
                         android:label="@string/app_default_dashboard_title"
@@ -3129,19 +3023,6 @@
                        android:value="true" />
         </activity-alias>
 
-        <activity-alias android:name="PaymentSettingsDashboardAlias"
-                        android:targetActivity="Settings$PaymentSettingsActivity">
-            <intent-filter android:priority="10">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.apps.default"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.nfc.PaymentSettings"/>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true"/>
-        </activity-alias>
-
         <!-- End of information architecture host activities -->
 
         <service
diff --git a/res/drawable/app_filter_spinner_background.xml b/res/drawable/app_filter_spinner_background.xml
new file mode 100644
index 0000000..70a56ff
--- /dev/null
+++ b/res/drawable/app_filter_spinner_background.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+            android:paddingMode="stack"
+            android:paddingStart="0dp"
+            android:paddingEnd="48dp"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp">
+    <item
+        android:gravity="end|fill_vertical"
+        android:width="48dp"
+        android:drawable="@*android:drawable/control_background_40dp_material" />
+
+    <item
+        android:drawable="@drawable/ic_expand_more_inverse"
+        android:gravity="end|center_vertical"
+        android:width="24dp"
+        android:height="24dp"
+        android:end="12dp" />
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_apps.xml b/res/drawable/ic_dashboard_apps.xml
deleted file mode 100644
index c0083a6..0000000
--- a/res/drawable/ic_dashboard_apps.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"
-        android:fillColor="#ec8122"/>
-</vector>
diff --git a/res/drawable/ic_dashboard_display.xml b/res/drawable/ic_dashboard_display.xml
deleted file mode 100644
index ae367cf..0000000
--- a/res/drawable/ic_dashboard_display.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#4184f3"
-        android:pathData="M20.0,15.31L23.31,12.0 20.0,8.69L20.0,4.0l-4.69,0.0L12.0,0.69 8.69,4.0L4.0,4.0l0.0,4.69L0.69,12.0 4.0,15.31L4.0,20.0l4.69,0.0L12.0,23.31 15.31,20.0L20.0,20.0l0.0,-4.69zM12.0,18.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0s-2.69,6.0 -6.0,6.0z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_security.xml b/res/drawable/ic_dashboard_security.xml
deleted file mode 100644
index 1e6a1e8..0000000
--- a/res/drawable/ic_dashboard_security.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#7a1ea1"
-        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_sound.xml b/res/drawable/ic_dashboard_sound.xml
deleted file mode 100644
index 0cd3b04..0000000
--- a/res/drawable/ic_dashboard_sound.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#4184f3"
-        android:pathData="M3.0,9.0l0.0,6.0l4.0,0.0l5.0,5.0L12.0,4.0L7.0,9.0L3.0,9.0zm13.5,3.0c0.0,-1.77 -1.02,-3.29 -2.5,-4.03l0.0,8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14.0,3.23l0.0,2.06c2.8,0.86 5.0,3.54 5.0,6.71s-2.11,5.85 -5.0,6.71l0.0,2.06c4.01,-0.91 7.0,-4.49 7.0,-8.77s-2.99,-7.86 -7.0,-8.77z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_storage.xml b/res/drawable/ic_dashboard_storage.xml
deleted file mode 100644
index 2b6160e..0000000
--- a/res/drawable/ic_dashboard_storage.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#4184f3"
-        android:pathData="M2.0,20.0l20.0,0.0l0.0,-4.0L2.0,16.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,19.0l0.0,-2.0zM2.0,4.0l0.0,4.0l20.0,0.0L22.0,4.0L2.0,4.0zm4.0,3.0L4.0,7.0L4.0,5.0l2.0,0.0l0.0,2.0zm-4.0,7.0l20.0,0.0l0.0,-4.0L2.0,10.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,13.0l0.0,-2.0z"/>
-</vector>
diff --git a/res/drawable/ic_dashboard_system.xml b/res/drawable/ic_dashboard_system.xml
deleted file mode 100644
index fdd9214..0000000
--- a/res/drawable/ic_dashboard_system.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#606060"
-        android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>
-</vector>
diff --git a/res/drawable/ic_dashboard_user.xml b/res/drawable/ic_dashboard_user.xml
deleted file mode 100644
index 302d33e..0000000
--- a/res/drawable/ic_dashboard_user.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#aeb32a"
-        android:pathData="M3.0,5.0
-        l0.0,14.0c0.0,1.0 0.89,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0
-        L21.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0
-        L5.0,3.0c-1.11,0.0 -2.0,0.9 -2.0,2.0zm12.0,4.0c0.0,1.66 -1.34,3.0 -3.0,3.0s-3.0,-1.34 -3.0,-3.0 1.34,-3.0 3.0,-3.0 3.0,1.34 3.0,3.0zm-9.0,8.0c0.0,-2.0 4.0,-3.1 6.0,-3.1s6.0,1.1 6.0,3.1l0.0,1.0
-        l-12.0,0l0.0,-1.0z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index 73407a3..20639a3 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -17,8 +17,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"
-        android:fillColor="#0b9c57"/>
+        android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_dashboard_network.xml b/res/drawable/ic_expand_more_inverse.xml
similarity index 68%
rename from res/drawable/ic_dashboard_network.xml
rename to res/drawable/ic_expand_more_inverse.xml
index 6c7ee2e..c39e3f9 100644
--- a/res/drawable/ic_dashboard_network.xml
+++ b/res/drawable/ic_expand_more_inverse.xml
@@ -16,11 +16,14 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="18.0"
-        android:viewportHeight="18.0">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorForegroundInverse">
+
     <path
-        android:fillColor="#0b9c57"
-        android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>
+        android:fillColor="@android:color/white"
+        android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>
+
 </vector>
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index 5b056e7..7a225e5 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -17,8 +17,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"
-        android:fillColor="#f3501d"/>
+        android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_settings_24dp_inverse.xml b/res/drawable/ic_settings_24dp_inverse.xml
new file mode 100644
index 0000000..6f70d21
--- /dev/null
+++ b/res/drawable/ic_settings_24dp_inverse.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorForegroundInverse">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66
+            -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3
+            -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2
+            14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59
+            -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49
+            0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66
+            0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3
+            0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42
+            0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25
+            1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49
+            -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57
+            -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index a689c4a..34c0bdd 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -17,8 +17,9 @@
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#3e50b4"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12.0,2.0c1.1,0.0 2.0,0.9 2.0,2.0s-0.9,2.0 -2.0,2.0 -2.0,-0.9 -2.0,-2.0 0.9,-2.0 2.0,-2.0zm9.0,7.0l-6.0,0.0l0.0,13.0l-2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0L9.0,22.0L9.0,9.0L3.0,9.0L3.0,7.0l18.0,0.0l0.0,2.0z"/>
 </vector>
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
index f1e56d8..c8e053d 100644
--- a/res/drawable/ic_settings_battery.xml
+++ b/res/drawable/ic_settings_battery.xml
@@ -17,9 +17,10 @@
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#4184f3"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M15.67,4.0L14.0,4.0L14.0,2.0l-4.0,0.0l0.0,2.0L8.33,4.0C7.6,4.0 7.0,4.6 7.0,5.33l0.0,15.33C7.0,21.4 7.6,22.0 8.33,22.0l7.33,0.0c0.74,0.0 1.34,-0.6 1.34,-1.33L17.0,5.33C17.0,4.6 16.4,4.0 15.67,4.0z
         M16,5l0,5.5l-8,0l0,-5.5l3,0l0,-2l2,0l0,2l3,0z"/>
 </vector>
diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml
index 3ba7404..3eebbb0 100644
--- a/res/layout/apps_filter_spinner.xml
+++ b/res/layout/apps_filter_spinner.xml
@@ -15,38 +15,32 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/actionBarSize"
+    android:background="?android:attr/colorAccent"
     android:gravity="center_vertical"
     android:paddingEnd="@dimen/switchbar_subsettings_margin_end"
-    android:theme="?attr/switchBarTheme" >
+    android:orientation="horizontal">
 
     <Spinner
         android:id="@+id/filter_spinner"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="64dp"
-        android:layout_marginEnd="70dp"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:textAlignment="viewStart" />
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:paddingStart="64dp"
+        android:background="@drawable/app_filter_spinner_background"/>
 
     <ImageView
         android:id="@+id/filter_settings"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="56dp"
         android:layout_height="56dp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:minHeight="0dp"
-        android:minWidth="0dp"
         android:contentDescription="@string/configure"
         android:scaleType="center"
-        android:src="@drawable/ic_settings_24dp"
-        style="?android:attr/borderlessButtonStyle"
+        android:src="@drawable/ic_settings_24dp_inverse"
         android:visibility="gone" />
 
-
-</RelativeLayout>
+</LinearLayout>
 
diff --git a/res/layout/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml
index 68f6f91..ffdd623 100644
--- a/res/layout/filter_spinner_item.xml
+++ b/res/layout/filter_spinner_item.xml
@@ -15,12 +15,14 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     style="?android:attr/spinnerItemStyle"
-    android:singleLine="true"
+    android:maxLines="1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
+    android:textColor="?android:attr/colorForegroundInverse"
     android:textAppearance="@style/TextAppearance.Switch"
-    android:textAlignment="inherit"/>
+    android:textAlignment="inherit" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3cf2f4c..2260e01 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Skakel foonoproepe en SMS aan?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Oproep- en SMS-geskiedenis sal met hierdie gebruiker gedeel word."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Noodinligting"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Inligting en kontakte vir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Laat programme en inhoud toe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programme met beperkings"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Brei instellings vir program uit"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Herselflaai toestel om telefonie-monitorverandering toe te pas"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Outomatiese stelselopdaterings"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Saamgebinde HAL\'s (vereis herselflaai)"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globale HTTP-instaanbediener is gestel"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Die administrateur kan die toestel sluit en die wagwoord terugstel"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Die administrateur kan alle toesteldata uitvee"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_1">%d</xliff:g> voordat alle toesteldata uitgevee word</item>
+      <item quantity="one">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_0">%d</xliff:g> voordat alle toesteldata uitgevee word</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_1">%d</xliff:g> voordat werkprofieldata uitgevee word</item>
+      <item quantity="one">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_0">%d</xliff:g> voordat werkprofieldata uitgevee word</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Hierdie toestel word bestuur."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Hierdie toestel word deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> bestuur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Kom meer te wete"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto\'s en video\'s"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiek en oudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Speletjies"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ander programme"</string>
     <string name="storage_files" msgid="8581083146777364063">"Lêers"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Bergingbestuurder: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Af"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aan"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Speletjies"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiolêers"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiek"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(gedeïnstalleer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(gedeaktiveer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Outovulprogram"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b9912f4..0cbeb4a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"የስልክ ጥሪዎች እና ኤስኤምኤስ ይብሩ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"የጥሪ እና የኤስኤምኤስ ታሪክ ለዚህ ተጠቃሚ ይጋራል።"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"የአስቸኳይ ጊዜ መረጃ"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"የ<xliff:g id="USER_NAME">%1$s</xliff:g> መረጃ እና እውቂያዎች"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"የቀለም ለውጥን ለመተግበር ማያ ገጹን ያጥፉት"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"የቴሌፎኒ መከታተያ ለውጥን ለመተግበር መሣሪያውን ዳግም ያስነሱት"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ራስ-ሰር የስርዓት ዝማኔዎች"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ዳግም ማስነሳት ያስፈልገዋል)"</string>
     <string name="usage" msgid="2977875522080448986">"አጠቃቀም"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ሁለንተናዊ የHTTP ወኪል ተዘጋጅቷል"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"አስተዳዳሪ መሣሪያን መቆለፍና የይለፍ ቃል ዳግም ማስጀመር ይችላል"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"አስተዳዳሪ ሁሉንም የመሣሪያ ውሂብ መሰረዝ ይችላል"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">አስተዳዳሪ ሁሉም የመሣሪያ ውሂብ ከመሰረዙ በፊት ከፍተኛው የይለፍ ቃል ሙከራዎች ወደ <xliff:g id="COUNT_1">%d</xliff:g> አቀናብረዋል</item>
+      <item quantity="other">አስተዳዳሪ ሁሉም የመሣሪያ ውሂብ ከመሰረዙ በፊት ከፍተኛው የይለፍ ቃል ሙከራዎች ወደ <xliff:g id="COUNT_1">%d</xliff:g> አቀናብረዋል</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">አስተዳዳሪ የስራ መገለጫ ውሂብ ከመሰረዙ በፊት ከፍተኛው የይለፍ ቃል ሙከራዎች ወደ <xliff:g id="COUNT_1">%d</xliff:g> አቀናብረዋል</item>
+      <item quantity="other">አስተዳዳሪ የስራ መገለጫ ውሂብ ከመሰረዙ በፊት ከፍተኛው የይለፍ ቃል ሙከራዎች ወደ <xliff:g id="COUNT_1">%d</xliff:g> አቀናብረዋል</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ይህ መሣሪያ የሚተዳደር ነው።"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚተዳደር ነው።"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"የበለጠ ለመረዳት"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ፎቶዎች እና ቪዲዮዎች"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"ሙዚቃ እና ኦዲዮ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ጨዋታዎች"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ሌሎች መተግበሪያዎች"</string>
     <string name="storage_files" msgid="8581083146777364063">"ፋይሎች"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"የማከማቻ አስተዳዳሪ፦ <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ጠፍቷል"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"በርቷል"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ጨዋታዎች"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"የኦዲዮ ፋይሎች"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ሙዚቃ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተራግፏል)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተሰናክሏል)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"የራስ-ሙላ መተግበሪያ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3761607..6aeecc7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1753,7 +1753,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">"انقر ۳ مرات للتكبير."</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_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"نص ذو درجة تباين عالية"</string>
@@ -2035,7 +2035,7 @@
     <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">"۳ ساعات"</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>
@@ -2516,8 +2516,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏تشغيل المكالمات الهاتفية والرسائل القصيرة SMS؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏ستتم مشاركة سجل المكالمات والرسائل القصيرة SMS مع هذا المستخدم."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"معلومات الطوارئ"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"المعلومات وجهات الاتصال للمستخدم <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"السماح بالتطبيقات والمحتوى"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"التطبيقات ذات القيود"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسيع إعدادات التطبيق"</string>
@@ -3124,8 +3123,8 @@
     <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">"متوسط الذاكرة المستخدمة خلال آخر ۳ ساعات: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="no_memory_use_summary" msgid="2016900536806235588">"لم يتم استخدام الذاكرة خلال آخر ۳ ساعات"</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>
     <string name="memory_performance" msgid="5661005192284103281">"الأداء"</string>
@@ -3265,8 +3264,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"درجة حرارة لون رائعة"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان أكثر روعة للشاشة"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"لتطبيق التغيير في اللون، أوقف الشاشة."</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"لتطبيق التغيير الذي تم إجراؤه على خدمة مراقبة الاتصالات الهاتفية، يُرجى إعادة تشغيل الجهاز"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏دمج طبقات تجريد اختلافات الأجهزة \"HALs\" (يتطلب إعادة التشغيل)"</string>
     <string name="usage" msgid="2977875522080448986">"الاستخدام"</string>
@@ -3547,14 +3545,30 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تم تعيين الخادم الوكيل HTTP العام"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"يمكن للمشرف قفل الجهاز وإعادة تعيين كلمة المرور"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"يمكن للمشرف حذف جميع بيانات الجهاز"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="zero">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="two">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على محاولتين (<xliff:g id="COUNT_1">%d</xliff:g>) فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="few">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولات فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="many">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="other">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="one">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على محاولة واحدة (<xliff:g id="COUNT_0">%d</xliff:g>) فقط قبل حذف كل بيانات الجهاز</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="zero">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="two">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على محاولتين <xliff:g id="COUNT_1">%d</xliff:g> فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="few">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولات فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="many">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="other">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="one">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على محاولة واحدة (<xliff:g id="COUNT_0">%d</xliff:g>) فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"تتم إدارة هذا الجهاز."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"تتم إدارة هذا الجهاز بواسطة <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"مزيد من المعلومات"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"الصور ومقاطع الفيديو"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"الموسيقى والصوت"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"الألعاب"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
     <string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
@@ -3565,9 +3579,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"إيقاف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"تشغيل"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"الألعاب"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ملفات صوتية"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"الموسيقى"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(تم إلغاء التثبيت للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(تم التعطيل للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"تطبيق الملء التلقائي"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 83f654d..858517e 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Boşluğu idarə edin"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtr variantları seçin"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Bütün tətbiqlər"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktiv tətbiqlər"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Endirilib"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Proses gedir"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB yaddaş"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> qalır"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Şarjın bitməsinə var: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekran istifadəsi"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Sonuncu tam doldurulmadan sonrakı tətbiq istifadəsi"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Sonuncu tam doldurulmadan sonrakı cihaz istifadəsi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Elektrik şəbəkəsindən çıxarılandan sonra batareya istifadəsi"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlanandan sonra batareya istifadəsi"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Batareyada <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s qədər istifadə edilib"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Batareyanın %1$s faizi"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Sonuncu tam doldurulmadan sonrakı istifadə problemi"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Təxmini qalan vaxt"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Batareyanın tam dolma vaxtı"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon zəngləri &amp; SMS aktivləşdirilsin?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zəng və SMS tarixçəsi bu istifadəçi ilə paylaşılacaq."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Təcili məlumat"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> üçün məlumat və kontaktlar"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tətbiq və kontentə icazə ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Məhdudiyyətli Tətbiqlər"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Tətbiq üçün parametrləri genişləndirin"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Defolt iş profili səsi"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Defolt iş siqnalı zəng melodiyası"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Şəxsi profil ilə eynidir"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Şəxsi profil səsləri istifadə olunsun?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Əvəz edin"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Cari profil səsləri əvəzinə şəxsi profil səsləri istifadə olunacaq"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zəng səsləri"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Digər səs və vibrasiyalar"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Bildiriş tərcihləri"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"İcazə verilməyib"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"İcazə sorğusu göndərilməyib"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Bütün proqramlar"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Quraşdırılmış tətbiqlər"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ani tətbiqlər"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Şəxsi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"İş"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloklanıb"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya monitoruna dəyişikliyi tətbiq etmək üçün cihazı yenidən yükləyin"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik sistem güncəlləmələri"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Bloklanmış HALlar (yenidən yükləmə tələb edir)"</string>
     <string name="usage" msgid="2977875522080448986">"İstifadə"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Qlobal HTTP proksi ayarlandı"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin cihazı kilidləyə və parolu sıfırlaya bilər"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin cihazın bütün datalarını silə bilər"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin bütün cihaz datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_1">%d</xliff:g> dəfəyə quraşdırdı</item>
+      <item quantity="one">Admin bütün cihaz datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_0">%d</xliff:g> dəfəyə quraşdırdı</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin iş profil datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_1">%d</xliff:g> dəfəyə quraşdırdı</item>
+      <item quantity="one">Admin iş profil datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_0">%d</xliff:g> dəfəyə quraşdırdı</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Bu cihaz idarə olunur."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən idarə olunur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ətraflı məlumat"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto və Videolar"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiqi və Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Digər tətbiqlər"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Yaddaş Meneceri: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Deaktiv"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiv"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Oyunlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fayllar"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiqi"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> üçün silindi)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> üçün deaktiv edildi)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Avtomatik doldurma tətbiqi"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 1741237..25d65a0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2453,8 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Istorija poziva i SMS-ova će se deliti sa ovim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije o hitnom slučaju"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije sa ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi podešavanja aplikacije"</string>
@@ -3172,8 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristi hladnije boje ekrana"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primenili promenu boje, isključite ekran"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Restartujte uređaj da biste primenili promenu TelephonyMonitor-a"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (zahteva restartovanje)"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -3424,14 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni HTTP proksi je podešen"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator može da zaključava uređaj i resetuje lozinku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može da briše sve podatke sa uređaja"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu svi podaci sa uređaja</item>
+      <item quantity="few">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu svi podaci sa uređaja</item>
+      <item quantity="other">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu svi podaci sa uređaja</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu podaci profila za Work</item>
+      <item quantity="few">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu podaci profila za Work</item>
+      <item quantity="other">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu podaci profila za Work</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ovim uređajem se upravlja."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Slike i video snimci"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzika i audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
@@ -3442,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menadžer memorijskog prostora: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio datoteke"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija za automatsko popunjavanje"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1dac577..8052b98 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -2474,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Уключыць тэлефонныя выклікі і SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Гэты карыстальнік атрымае доступ да гісторыі выклікаў і SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Інфармацыя для экстранных сітуацый"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Інфармацыя і кантакты карыстальніка <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Разгарнуць параметры прыкладання"</string>
@@ -3203,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Халодная каляровая тэмпература"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Выкарыстоўваць больш халодныя колеры экрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Каб прымяніць змяненне колеру, адключыце экран"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Каб змены ў сродку адсочвання тэлефаніі былі прыменены, трэба перазагрузіць прыладу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (патрабуецца перазагрузка)"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
@@ -3465,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глабальны HTTP-проксі зададзены"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Адміністратар можа блакіраваць прыладу і скідваць пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Адміністратар можа выдаляць усе даныя прылады"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+      <item quantity="few">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+      <item quantity="many">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+      <item quantity="other">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+      <item quantity="few">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+      <item quantity="many">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+      <item quantity="other">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Гэта прылада знаходзіцца пад кіраваннем."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Даведацца больш"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фота і відэа"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка і аўдыя"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Гульні"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Іншыя праграмы"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
@@ -3483,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджар сховішча: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Выключаны"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Уключаны"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Гульні"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аўдыяфайлы"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(выдалена для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(адключана для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Праграма для аўтазапаўнення"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3888f2a..dbc11f1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Да се включат ли телефонните обаждания и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историята на обажданията и SMS съобщенията ще се сподели с този потребител."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информация за спешни случаи"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Информация и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да приложите промяната на цветовете, изключете екрана"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"За да приложите промяната във функцията за наблюдение на телефонията, рестартирайте устройството"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматични системни актуализации"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Свързани абстрактни хардуерни слоеве (изисква рестартиране)"</string>
     <string name="usage" msgid="2977875522080448986">"Пренос на данни"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Зададен е общ HTTP прокси сървър"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администраторът може да заключи устройството и да зададе нова парола"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администраторът може да изтрие всички данни на устройството"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Администраторът е задал всички данни на устройството да бъдат изтрити след <xliff:g id="COUNT_1">%d</xliff:g> опита за въвеждане на паролата</item>
+      <item quantity="one">Администраторът е задал всички данни на устройството да бъдат изтрити след <xliff:g id="COUNT_0">%d</xliff:g> опит за въвеждане на паролата</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Администраторът е задал данните от служебния потребителски профил да бъдат изтрити след <xliff:g id="COUNT_1">%d</xliff:g> опита за въвеждане на паролата</item>
+      <item quantity="one">Администраторът е задал данните от служебния потребителски профил да бъдат изтрити след <xliff:g id="COUNT_0">%d</xliff:g> опит за въвеждане на паролата</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Това устройство се управлява."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Това устройство се управлява от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Научете повече"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Снимки и видеоклипове"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика и аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Други приложения"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлове"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Мениджър на хранилището: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Изкл."</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Вкл."</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлове"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинстал. за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(деактивирано за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Приложение за автоматично попълване"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index fd92612..9125c19 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"স্থান পরিচালনা করুন"</string>
     <string name="filter" msgid="2018011724373033887">"ফিল্টার"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ফিল্টার বিকল্পগুলি বেছে নিন"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"সমস্ত অ্যাপ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"অক্ষম করা অ্যাপগুলি"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ডাউনলোড করা"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"চলমান"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB সঞ্চয়স্থান"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> অবশিষ্ট রয়েছে"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> চার্জ করা বাকি"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"স্ক্রিনের ব্যবহার"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্রিনের জন্য ব্যবহার"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"শেষ বার সম্পূর্ণ চার্জের পর থেকে অ্যাপের ব্যবহার"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"শেষ বার সম্পূর্ণ চার্জের পর থেকে ডিভাইসের ব্যবহার"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"আনপ্লাগ করার পর থেকে ব্যাটারি ব্যবহার"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"আবার সেট করা থেকে ব্যাটারি ব্যবহার"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ব্যাটারিতে"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s এর জন্য ব্যবহার করা হয়েছে"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"সম্পূর্ণ ব্যাটারির %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"শেষবার সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারি ব্যবহারের হিসেব"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"আনুমানিক কতক্ষণ বাকি"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"পরে সম্পূর্ণ চার্জ হবে"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ফোন কলগুলিকে এবং SMS চালু করবেন?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"কল ও SMS ইতিহাস এই ব্যবহারকারীর সাথে শেয়ার করা হবে।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"জরুরি তথ্য"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর তথ্য ও পরিচিতি"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"অ্যাপ্লিকেশান এবং সামগ্রীর অনুমতি দিন"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"সীমাবদ্ধ সহ অ্যাপ্লিকেশানগুলি"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশানের জন্য সেটিংস প্রসারিত করুন"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ডিফল্ট কর্মস্থলের বিজ্ঞপ্তি টোন"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ডিফল্ট কর্মস্থলের অ্যালার্ম রিংটোন"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ব্যক্তিগত প্রোফাইলের অনুরূপ"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করবেন?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"প্রতিস্থাপন করুন"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"আপনার বর্তমান কর্মস্থলের প্রোফাইলের ধ্বনির বদলে আপনার ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করা হবে"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"রিংটোনগুলি"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"অন্যান্য শব্দ এবং কম্পন"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"বিজ্ঞপ্তির পছন্দগুলি"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"কোন অনুমতি দেওয়া হয় নি"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"কোন অনুমতির অনুরোধ জানানো হয় নি"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশান"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ইনস্টল করা অ্যাপগুলি"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ঝটপট অ্যাপ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"কাজ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"অবরুদ্ধ রয়েছে"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"কুল রঙের টেম্পারেচার"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"রঙের পরিবর্তন প্রয়োগ করতে, স্ক্রীন বন্ধ করুন"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"টেলিফোনি মনিটর এ করা পরিবর্তন প্রয়োগ করতে ডিভাইসটি বন্ধ করে আবার চালু করুন"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"স্বয়ংক্রিয় সিস্টেম আপডেটগুলি"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL গুলি (আবার চালু করতে হবে)"</string>
     <string name="usage" msgid="2977875522080448986">"ব্যবহার"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"বৈশ্বিক HTTP প্রক্সী সেট করা আছে"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"প্রশাসক ডিভাইসটি লক করতে ও পাসওয়ার্ড রিসেট করতে পারবেন"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"প্রশাসক ডিভাইসের সমস্ত ডেটা মুছে দিতে পারবেন"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">প্রশাসক পাসওয়ার্ড দেওয়ার প্রচেষ্টা সর্বাধিক সংখ্যা <xliff:g id="COUNT_1">%d</xliff:g> এ নির্দিষ্ট করেছেন, তার বেশি বার ভুল পাসওয়ার্ড দিলে ডিভাইসের সমস্ত ডেটা মুছে দেওয়া হবে</item>
+      <item quantity="other">প্রশাসক পাসওয়ার্ড দেওয়ার প্রচেষ্টা সর্বাধিক সংখ্যা <xliff:g id="COUNT_1">%d</xliff:g> এ নির্দিষ্ট করেছেন, তার বেশি বার ভুল পাসওয়ার্ড দিলে ডিভাইসের সমস্ত ডেটা মুছে দেওয়া হবে</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">প্রশাসক পাসওয়ার্ড দেওয়ার প্রচেষ্টা সর্বাধিক সংখ্যা <xliff:g id="COUNT_1">%d</xliff:g> এ নির্দিষ্ট করেছেন, তার বেশি বার ভুল পাসওয়ার্ড দিলে কর্মস্থলের প্রোফাইলের ডেটা মুছে দেওয়া হবে</item>
+      <item quantity="other">প্রশাসক পাসওয়ার্ড দেওয়ার প্রচেষ্টা সর্বাধিক সংখ্যা <xliff:g id="COUNT_1">%d</xliff:g> এ নির্দিষ্ট করেছেন, তার বেশি বার ভুল পাসওয়ার্ড দিলে কর্মস্থলের প্রোফাইলের ডেটা মুছে দেওয়া হবে</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"এই ডিভাইসটি পরিচালিত।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"আরো জানুন"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ফটো ও ভিডিও"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"সঙ্গীত ও অডিও"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
     <string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"সঞ্চয়স্থান পরিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"বন্ধ আছে"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"চালু আছে"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"গেম্স"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"অডিও ফাইলগুলি"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"সঙ্গীত"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য আনইনস্টল হয়েছে)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য অক্ষম হয়েছে)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"স্বতঃপূরণ অ্যাপ"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a2aba8c..f484821 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2453,8 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historija poziva i SMS-ova će se dijeliti s ovim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije za hitne slučajeve"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
@@ -2989,7 +2988,7 @@
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja za korištenje"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij višak aplikacija"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
@@ -3172,8 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristite hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Isključite ekran kako biste primijenili promjenu boje"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da primijenite promjenu na nadzoru telefonije, ponovo pokrenite uređaj"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (potrebno je ponovo pokrenuti)"</string>
     <string name="usage" msgid="2977875522080448986">"Upotreba"</string>
@@ -3424,14 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalno postavljanje za HTTP proksi"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator može zaključati uređaj i postaviti novu lozinku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može izbrisati sve podatke iz uređaja"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaj upisivanja lozinke prije brisanja svih podataka s uređaja</item>
+      <item quantity="few">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja svih podataka s uređaja</item>
+      <item quantity="other">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja svih podataka s uređaja</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaj upisivanja lozinke prije brisanja podataka radnog profila</item>
+      <item quantity="few">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja podataka radnog profila</item>
+      <item quantity="other">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja podataka radnog profila</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ovim uređajem se upravlja."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografije i videozapisi"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzika i zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fajlovi"</string>
@@ -3442,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohranom: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fajlovi"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija za automatsko popunjavanje"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2ee464d..31ef87b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vols activar les trucades i els SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historial de trucades i de SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informació d\'emergència"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informació i contactes de: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Desplega configuració aplicació"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Desactiva la pantalla per aplicar el canvi de color"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per aplicar canvis al monitor de telefonia, reinicia el dispositiu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualitzacions del sistema automàtiques"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (s\'ha de reiniciar)"</string>
     <string name="usage" msgid="2977875522080448986">"Ús"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"S\'ha definit el servidor intermediari HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'administrador pot bloquejar el dispositiu i restablir-ne la contrasenya"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'administrador pot suprimir totes les dades del dispositiu"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">L\'administrador ha establert en <xliff:g id="COUNT_1">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin totes les dades del dispositiu</item>
+      <item quantity="one">L\'administrador ha establert en <xliff:g id="COUNT_0">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin totes les dades del dispositiu</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">L\'administrador ha establert en <xliff:g id="COUNT_1">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin les dades del perfil professional</item>
+      <item quantity="one">L\'administrador ha establert en <xliff:g id="COUNT_0">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin les dades del perfil professional</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Aquest és un dispositiu gestionat."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> gestiona aquest dispositiu."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Més informació"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos i vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música i àudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jocs"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Altres aplicacions"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxers"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor d\'emmagatzematge: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desactivat"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activat"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jocs"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fitxers d\'àudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstal·lat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicació d\'emplenament automàtic"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bcf6e56..27c799e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2474,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnout telefonní hovory a SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S tímto uživatelem bude sdílena historie hovorů a SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Nouzové informace"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informace a kontakty uživatele <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
@@ -3203,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Chcete-li změnu barev použít, vypněte obrazovku"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Chcete-li použít změnu sledování telefonních služeb, restartujte zařízení"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizace systému"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Navázané moduly HAL (vyžaduje restart)"</string>
     <string name="usage" msgid="2977875522080448986">"Využití"</string>
@@ -3465,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globální proxy server protokolu HTTP je nastaven"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrátor může zařízení uzamknout a resetovat heslo"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrátor může smazat všechna data v zařízení"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusy o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+      <item quantity="many">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusu o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+      <item quantity="other">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusů o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+      <item quantity="one">Administrátor nastavil maximálně <xliff:g id="COUNT_0">%d</xliff:g> pokus o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusy o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+      <item quantity="many">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusu o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+      <item quantity="other">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusů o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+      <item quantity="one">Administrátor nastavil maximálně <xliff:g id="COUNT_0">%d</xliff:g> pokus o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Toto zařízení je spravováno."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Toto zařízení je spravováno organizací <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Další informace"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotky a videa"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Hudba a zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Hry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Další aplikace"</string>
     <string name="storage_files" msgid="8581083146777364063">"Soubory"</string>
@@ -3483,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správce úložiště: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Vypnuto"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Zapnuto"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Hry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvukové soubory"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Hudba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(pro uživatele <xliff:g id="USER">%s</xliff:g> odinstalováno)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(pro uživatele <xliff:g id="USER">%s</xliff:g> nedostupné)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikace na automatické vyplňování"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9e0287c..e0ccc18 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2082,7 +2082,7 @@
     <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Hvis du fortsætter, vil din bruger blive styret af din administrator, som også kan gemme tilknyttet data ud over dine personlige data.\n\nDin administrator har mulighed for at overvåge og administrere indstillinger, adgang, apps og data, der er knyttet til denne bruger, herunder netværksaktivitet og enhedens stedoplysninger."</string>
     <string name="admin_disabled_other_options" msgid="4564776259414246934">"Andre valgmuligheder er deaktiveret af din administrator."</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Flere oplysninger"</string>
-    <string name="untitled_apn" msgid="1230060359198685513">"Ikke-navngivet"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Unavngivet"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Generelt"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Underretningslogfil"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringetone og vibration ved opkald"</string>
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du aktivere telefonopkald og sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Opkalds- og sms-historikken deles med denne bruger."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Oplysninger i nødsituationer"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Oplysninger og kontaktpersoner for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Du skal slå skærmen fra, før du kan anvende farveændringer"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Genstart enheden for at anvende ændringen i forbindelse med Overvågning af telefoni"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemopdateringer"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Gruppér HAL\'er i mappe (kræver genstart)"</string>
     <string name="usage" msgid="2977875522080448986">"Forbrug"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy er konfigureret"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratoren kan låse enheden og nulstille adgangskoden"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratoren kan slette alle data på enheden"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter alle enhedens data slettes</item>
+      <item quantity="other">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter alle enhedens data slettes</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter data for arbejdsprofilen slettes</item>
+      <item quantity="other">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter data for arbejdsprofilen slettes</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Dette er en administreret enhed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Denne enhed administreres af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Få flere oplysninger"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Billeder og videoer"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik og lyd"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spil"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagerstyring: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Fra"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Til"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spil"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Lydfiler"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(afinstalleret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(deaktiveret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Autofyld-app"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 05388ac..06fafdf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Anrufe &amp; SMS aktivieren?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrufliste und SMS-Verlauf werden für diesen Nutzer freigegeben."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Notfallinformationen"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informationen und Kontakte für <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps und Inhalte zulassen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps mit Einschränkungen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"App-Einstellungen erweitern"</string>
@@ -2663,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standard-Benachrichtigungston für Arbeitsprofil"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standard-Weckton für Arbeitsprofil"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Dieselben wie beim persönlichen Profil"</string>
-    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Töne vom persönlichen Profil verwenden?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Töne des persönlichen Profil verwenden?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ersetzen"</string>
-    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Statt der aktuellen Töne deines Arbeitsprofil werden die Töne deines persönlichen Profils verwendet"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Statt der aktuellen Töne deines Arbeitsprofils werden die Töne deines persönlichen Profils verwendet"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Klingeltöne"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andere Töne und Vibrationen"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Benachrichtigungseinstellungen"</string>
@@ -3143,8 +3142,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Deaktiviere den Bildschirm, um die neue Farbeinstellung zu übernehmen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Gerät neu starten, damit die Änderungen bei Telephony Monitor wirksam werden"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische Systemupdates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Gebundene HALs (Neustart erforderlich)"</string>
     <string name="usage" msgid="2977875522080448986">"Nutzung"</string>
@@ -3385,14 +3383,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichet"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Der Administrator kann das Gerät sperren und das Passwort zurücksetzen"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Der Administrator kann alle Gerätedaten löschen"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Der Administrator lässt maximal <xliff:g id="COUNT_1">%d</xliff:g> falsche Passworteingaben zu. Bei Überschreitung dieser Anzahl werden alle Gerätedaten gelöscht.</item>
+      <item quantity="one">Der Administrator lässt maximal <xliff:g id="COUNT_0">%d</xliff:g> falsche Passworteingabe zu. Bei Überschreitung dieser Anzahl werden alle Gerätedaten gelöscht.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Der Administrator lässt maximal <xliff:g id="COUNT_1">%d</xliff:g> falsche Passworteingaben zu. Bei Überschreitung dieser Anzahl werden alle Daten des Arbeitsprofils gelöscht.</item>
+      <item quantity="one">Der Administrator lässt maximal <xliff:g id="COUNT_0">%d</xliff:g> falsche Passworteingabe zu. Bei Überschreitung dieser Anzahl werden alle Daten des Arbeitsprofils gelöscht.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Dieses Gerät wird verwaltet."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> verwaltet."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Weitere Informationen"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos und Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik und Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spiele"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Weitere Apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dateien"</string>
@@ -3403,9 +3409,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Speichermanager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Aus"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"An"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spiele"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiodateien"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deinstalliert)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deaktiviert)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"AutoFill-App"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ea1acb0..c54cf94 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ενεργοποίηση τηλεφωνικών κλήσεων και SMS;"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Θα γίνει κοινή χρήση του ιστορικού κλήσεων και SMS με αυτόν το χρήστη."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Πληροφορίες έκτακτης ανάγκης"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Πληροφορίες και επαφές για τον χρήστη <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ψυχρή θερμοκρασία χρώματος"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Για να εφαρμόσετε μια αλλαγή στο χρώμα, απενεργοποιήστε την οθόνη"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Για να πραγματοποιήσετε αλλαγές στην παρακολούθηση τηλεφωνίας, επανεκκινήστε τη συσκευή"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Αυτόματες ενημερώσεις συστήματος"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL με βιβλιοδεσία (απαιτεί επανεκκίνηση)"</string>
     <string name="usage" msgid="2977875522080448986">"Χρήση"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ο γενικός διακομιστής μεσολάβησης HTTP ορίστηκε"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Ο διαχειριστής μπορεί να κλειδώσει τη συσκευή και να επαναφέρει τον κωδικό πρόσβασης"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Ο διαχειριστής μπορεί να διαγράψει όλα τα δεδομένα της συσκευής"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Ο διαχειριστής όρισε τον μέγιστο αριθμό προσπαθειών εισαγωγής κωδικού πρόσβασης σε <xliff:g id="COUNT_1">%d</xliff:g> πριν από τη διαγραφή όλων των δεδομένων της συσκευής</item>
+      <item quantity="one">Ο διαχειριστής όρισε τον μέγιστο αριθμό προσπαθειών εισαγωγής κωδικού πρόσβασης σε <xliff:g id="COUNT_0">%d</xliff:g> πριν από τη διαγραφή όλων των δεδομένων της συσκευής</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Ο διαχειριστής όρισε τον μέγιστο αριθμό προσπαθειών εισαγωγής κωδικού πρόσβασης σε <xliff:g id="COUNT_1">%d</xliff:g> πριν από τη διαγραφή των δεδομένων του προφίλ εργασίας</item>
+      <item quantity="one">Ο διαχειριστής όρισε τον μέγιστο αριθμό προσπαθειών εισαγωγής κωδικού πρόσβασης σε <xliff:g id="COUNT_0">%d</xliff:g> πριν από τη διαγραφή των δεδομένων του προφίλ εργασίας</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Αυτή η συσκευή είναι διαχειριζόμενη."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Τη συσκευή διαχειρίζεται ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Μάθετε περισσότερα"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Φωτογραφίες και βίντεο"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Μουσική και ήχος"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Παιχνίδια"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Άλλες εφαρμογές"</string>
     <string name="storage_files" msgid="8581083146777364063">"Αρχεία"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Διαχείριση αποθηκευτικού χώρου: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Ανενεργή"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ενεργή"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Παιχνίδια"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Αρχεία ήχου"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Μουσική"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(απεγκαταστάθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Εφαρμογή αυτόματης συμπλήρωσης"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 56b4849..da57bfc 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderised HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin can lock device and reset password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"This device is managed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Find out more"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos &amp; Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Music"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Auto-fill app"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index be0fcb9..8c91a64 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderised HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin can lock device and reset password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"This device is managed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Find out more"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos &amp; Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Music"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Auto-fill app"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index be0fcb9..8c91a64 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderised HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin can lock device and reset password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"This device is managed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Find out more"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos &amp; Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Music"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Auto-fill app"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 19236db..0d0fcb7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas telefónicas y SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Se compartirá el historial de llamadas y SMS con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emergencia"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Información y contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
@@ -3139,8 +3138,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio de Telephony Monitor, reinicia el dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones automáticas del sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL enlazados (requiere reinicio)"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -3381,14 +3379,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se estableció el proxy HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"El administrador puede bloquear el dispositivo y restablecer la contraseña"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"El administrador puede borrar todos los datos del dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_1">%d</xliff:g> antes de que se borren todos los datos del dispositivo</item>
+      <item quantity="one">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_0">%d</xliff:g> antes de que se borren todos los datos del dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_1">%d</xliff:g> antes que se borren los datos del perfil de trabajo</item>
+      <item quantity="one">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_0">%d</xliff:g> antes de que se borren los datos del perfil de trabajo</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo es administrado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Más información"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos y videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música y audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
@@ -3399,9 +3405,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desactivado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Archivos de audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(se desinstaló para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(se inhabilitó para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App de autocompletar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b538ddb..3539647 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas y SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"El historial de SMS y de llamadas se compartirán con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emergencia"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Información y contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar ajustes de aplicación"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio al monitor de telefonía, reinicia el dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones del sistema automáticas"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Enlace de HAL (hay que reiniciar)"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se ha definido el proxy HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"El administrador puede bloquear el dispositivo y cambiar la contraseña"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"El administrador puede eliminar todos los datos del dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">El administrador ha establecido un máximo de <xliff:g id="COUNT_1">%d</xliff:g> intentos para introducir la contraseña antes de eliminar todos los datos del dispositivo</item>
+      <item quantity="one">El administrador ha establecido un máximo de <xliff:g id="COUNT_0">%d</xliff:g> intento para introducir la contraseña antes de eliminar todos los datos del dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">El administrador ha establecido un máximo de <xliff:g id="COUNT_1">%d</xliff:g> intentos antes de eliminar los datos del perfil de trabajo</item>
+      <item quantity="one">El administrador ha establecido un máximo de <xliff:g id="COUNT_0">%d</xliff:g> intento antes de eliminar los datos del perfil de trabajo</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este es un dispositivo administrado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Más información"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos y vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música y audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras aplicaciones"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de Almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desactivado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Archivos de audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(opción desinstalada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(opción inhabilitada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicación para autocompletar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e7cfcf0..7b1cc15 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtrivalikute valimine"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Kõik rakendused"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Keelatud rakendused"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Allalaaditud"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Töös"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-mäluseade"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Jäänud on <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> laadimise lõpuni"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekraanikasutus"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekraani energiatarve"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Rakenduse kasutus pärast viimast täislaadimist"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Seadme kasutus pärast viimast täislaadimist"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akukasutus alates lähtestamisest"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akutoitel"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Kasutatud %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s akumahust"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Kasutuse jaotus pärast viimast täislaadimist"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Hinnanguline järelejäänud aeg"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Täielikult täis laadimiseni jäänud aeg"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kas lülitada telefonikõned ja SMS-id sisse?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Selle kasutajaga jagatakse kõne- ja SMS-ajalugu."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Hädaabiteave"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Kasutaja <xliff:g id="USER_NAME">%1$s</xliff:g> teave ja kontaktid"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Rakenduste ja sisu lubamine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Piirangutega rakendused"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laienda rakenduste seadeid"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Töömärguande vaiketoon"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Tööalarmi vaikehelin"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama mis isiklikul profiilil"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Kas kasutada isikliku profiili helisid?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Asenda"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Teie tööprofiili praeguste helide asemel kasutatakse teie isikliku profiili helisid"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Helinad"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Muud helid ja vibratsioonid"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Märguannete eelistused"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Lube ei antud"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Lube ei taotletud"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Kõik rakendused"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installitud rakendused"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Installimata avat. rakendused"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Isiklik"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Töö"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeeritud"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Värvi muutmise rakendamiseks lülitage ekraan välja"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Teenuse Telephony Monitor muudatuse rakendamiseks taaskäivitage seade"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaatsed süsteemivärskendused"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Virnastatud HAL-id (vajalik on taaskäivitamine)"</string>
     <string name="usage" msgid="2977875522080448986">"Kasutus"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Üldine HTTP-puhverserver on seadistatud"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administraator saab seadme lukustada ja parooli lähtestada"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administraator saab kustutada kõik seadme andmed"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administraator määras, et enne kõigi seadmes olevate andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_1">%d</xliff:g> korda</item>
+      <item quantity="one">Administraator määras, et enne kõigi seadmes olevate andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_0">%d</xliff:g> korra</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administraator määras, et enne tööprofiili andmete andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_1">%d</xliff:g> korda</item>
+      <item quantity="one">Administraator määras, et enne tööprofiili andmete andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_0">%d</xliff:g> korra</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Seda seadet hallatakse."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Seda seadet haldab <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Lisateave"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotod ja videod"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muusika ja heli"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Mängud"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Muud rakendused"</string>
     <string name="storage_files" msgid="8581083146777364063">"Failid"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Salvestusruumi haldur: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Väljas"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Sees"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Mängud"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Helifailid"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muusika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstall. kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(keelatud kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automaattäite rakendus"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 96ee3a3..5cf16da 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefono-deiak eta SMSak aktibatu nahi dituzu?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Deien eta SMS mezuen historia erabiltzaile honekin partekatuko da."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Larrialdietarako informazioa"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> erabiltzailearen datuak eta kontaktuak"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Baimendu aplikazioak eta edukia"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Murrizketak dituzten aplikazioak"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zabaldu aplikazio-ezarpenak"</string>
@@ -2663,7 +2662,7 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Laneko jakinarazpenen tonu lehenetsia"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Laneko alarmaren tonu lehenetsia"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Profil pertsonalaren berberak"</string>
-    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Erabili profil pertsonaleko soinuak"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Profil pertsonaleko soinuak erabili?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ordeztu"</string>
     <string name="work_sync_dialog_message" msgid="9066322310245055242">"Profil pertsonaleko soinuak erabiliko dira laneko profilekoen ordez"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonuak"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kolorea aldatzeko, itzal ezazu pantaila"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefono-gainbegiratzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sistemaren eguneratze automatikoak"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Hardwarearen abstrakzio-geruza (HAL) artxibatuak (berrabiarazi egin behar da)"</string>
     <string name="usage" msgid="2977875522080448986">"Erabilera"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"HTTP proxy orokorra ezarri da"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratzaileak gailua blokea eta pasahitza berrezar ditzake"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratzaileak gailuko datu guztiak ezaba ditzake"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Pasahitza idazteko gehienez <xliff:g id="COUNT_1">%d</xliff:g> saiakera egin daitezkeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira gailuko datu guztiak.</item>
+      <item quantity="one">Pasahitza idazteko gehienez <xliff:g id="COUNT_0">%d</xliff:g> saiakera egin daitekeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira gailuko datu guztiak.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Pasahitza idazteko gehienez <xliff:g id="COUNT_1">%d</xliff:g> saiakera egin daitezkeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira laneko profileko datu guztiak.</item>
+      <item quantity="one">Pasahitza idazteko gehienez <xliff:g id="COUNT_0">%d</xliff:g> saiakera egin daitekeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira laneko profileko datu guztiak.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Gailu kudeatu bat da hau."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen du gailu hau."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Lortu informazio gehiago"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Argazkiak eta bideoak"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musika eta audioa"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jokoak"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Beste aplikazio batzuk"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxategiak"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Memoria-kudeatzailea: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desaktibatuta"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktibatuta"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jokoak"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio-fitxategiak"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> - desinstalatuta)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> - desgaituta)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Betetze automatikoen aplikazioa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 95f9412..9edaac2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"انتخاب گزینه‌های فیلتر"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"همه برنامه‌ها"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"برنامه‌های غیرفعال‌شده"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"دانلودشده"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"در حال اجرا"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏حافظهٔ USB"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> مانده"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> مانده تا شارژ کامل"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"استفاده صفحه‌نمایش"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"مصرف صفحه‌نمایش"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"مصرف برنامه از آخرین شارژ کامل"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"مصرف دستگاه از آخرین شارژ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"استفاده از باتری از زمان بازنشانی"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> در باتری"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"‏استفاده‌ به مدت %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"‏%1$s از کل شارژ باتری"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"تفکیک مصرف شارژ از آخرین شارژ کامل"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"زمان باقی‌مانده تخمینی"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"زمان شارژ کامل"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"تماس‌های تلفنی و پیامک روشن شوند؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"سابقه پیامک و تماس، با این کاربر به اشتراک گذاشته می‌شود."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"اطلاعات اضطراری"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"اطلاعات و مخاطبین <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"برنامه‌ها و محتوا مجازاند"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"برنامه‌های دارای محدودیت"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسعه تنظیمات برای برنامه"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"آهنگ اعلان کار پیش‌فرض"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"آهنگ زنگ هشدار کار پیش‌فرض"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"مانند نمایه شخصی"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"از صداهای نمایه شخصی استفاده شود؟"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"جایگزینی"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"به‌جای صداهای نمایه کاری فعلی، از صداهای نمایه شخصی‌تان استفاده خواهد شد."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"آهنگ‌های زنگ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"صداها و لرزش‌های دیگر"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"تنظیمات برگزیده اعلان"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"اجازه‌ای داده نشده"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"اجازه‌ای درخواست نشده"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"همه برنامه‌ها"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"برنامه‌های نصب‌شده"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"برنامه‌های فوری"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"شخصی"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"کاری"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود شده"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"دمای رنگ سرد"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"برای اعمال تغییر رنگ، صفحه را خاموش کنید"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"‏برای اعمال تغییر Telephony Monitor، دستگاه را راه‌اندازی مجدد کنید"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"به‌روزرسانی‌های خودکار سیستم"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏Binderized HALs (به راه‌اندازی مجدد نیاز دارد)"</string>
     <string name="usage" msgid="2977875522080448986">"میزان مصرف"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تنظیم پروکسی HTTP جهانی"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"سرپرست می‌تواند دستگاه را قفل و گذرواژه را بازنشانی کند"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"سرپرست می‌تواند همه داده‌های دستگاه را پاک کند"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">بنابر تنظیم سرپرست، قبل از حذف شدن همه داده‌های دستگاه حداکثر <xliff:g id="COUNT_1">%d</xliff:g> بار می‌توانید گذرواژه را وارد کنید</item>
+      <item quantity="other">بنابر تنظیم سرپرست، قبل از حذف شدن همه داده‌های دستگاه حداکثر <xliff:g id="COUNT_1">%d</xliff:g> بار می‌توانید گذرواژه را وارد کنید</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">بنابر تنظیم سرپرست، قبل از حذف شدن همه داده‌های نمایه کاری حداکثر <xliff:g id="COUNT_1">%d</xliff:g> بار می‌توانید گذرواژه را وارد کنید</item>
+      <item quantity="other">بنابر تنظیم سرپرست، قبل از حذف شدن همه داده‌های نمایه کاری حداکثر <xliff:g id="COUNT_1">%d</xliff:g> بار می‌توانید گذرواژه را وارد کنید</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"این دستگاه مدیریت می‌شود."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"این دستگاه توسط <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> مدیریت می‌شود."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"بیشتر بدانید"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"عکس و ویدیو"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"موسیقی و صوتی"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"بازی‌ها"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"سایر برنامه‌ها"</string>
     <string name="storage_files" msgid="8581083146777364063">"فایل‌ها"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"مدیریت حافظه: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"خاموش"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"روشن"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"بازی"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"فایل‌های صوتی"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"موسیقی"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(برای کاربر <xliff:g id="USER">%s</xliff:g> حذف نصب شد)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(برای کاربر <xliff:g id="USER">%s</xliff:g> غیرفعال شد)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"برنامه تکمیل خودکار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9564237..e3391e7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Otetaanko puhelut ja tekstiviestit käyttöön?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Soitto- ja tekstiviestihistoria jaetaan tämän käyttäjän kanssa."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Hätätilannetiedot"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Käyttäjän <xliff:g id="USER_NAME">%1$s</xliff:g> tiedot ja yhteystiedot"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Sovellusten ja sisällön salliminen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Rajoitetut sovellukset"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laajenna sovelluksen asetuksia"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ota värin muutos käyttöön sammuttamalla näyttö."</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Käynnistä laite uudelleen, niin puhelinpalvelujen seurannan muutokset astuvat voimaan."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaattiset järjestelmäpäivitykset"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Sido HALit yhteen (vaatii uudelleenkäynnistystä)"</string>
     <string name="usage" msgid="2977875522080448986">"Käyttö"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Yleinen HTTP-välityspalvelin asetettu"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Järjestelmänvalvoja voi lukita laitteen ja vaihtaa salasanan."</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Järjestelmänvalvoja voi poistaa kaikki laitteen tiedot."</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_1">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen kaikki laitteen tiedot poistetaan.</item>
+      <item quantity="one">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_0">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen kaikki laitteen tiedot poistetaan.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_1">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen työprofiilin tiedot poistetaan.</item>
+      <item quantity="one">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_0">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen työprofiilin tiedot poistetaan.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Tämä on hallinnoitu laite."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Tätä laitetta hallitsee <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Lisätietoja"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Kuvat ja videot"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiikki ja audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Pelit"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Muut sovellukset"</string>
     <string name="storage_files" msgid="8581083146777364063">"Tiedostot"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tallennustilan hallinta: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Poissa"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Päällä"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Pelit"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Äänitiedostot"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiikki"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(poistettu käyttäjältä <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(poistettu käytöstä: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automaattisen täytön sovellus"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 63ea151..7de6868 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1830,7 +1830,7 @@
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant le chargement complet"</string>
     <string name="device_screen_usage" msgid="224482533839040430">"Utilisation de l\'écran"</string>
-    <string name="device_screen_consumption" msgid="4607589286438986687">"Utilisation par l\'écran"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
     <string name="power_usage_list_summary" msgid="792703666229965848">"Utilisation des applis depuis la dernière charge complète"</string>
     <string name="device_usage_list_summary" msgid="1545514224536252111">"Utilisation de l\'appareil depuis la dernière charge complète"</string>
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les textos?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des textos sera partagé avec cet utilisateur."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Coordonnées d\'urgence"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Information et contacts pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer les changements de TelephonyMonitor, redémarrez l\'appareil"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (redémarrage nécessaire)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilisation"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Le serveur mandataire HTTP global a été défini"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'administrateur peut supprimer toutes les données de l\'appareil"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, toutes les données de l\'appareil seront supprimées.</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, toutes les données de l\'appareil seront supprimées.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, les données du profil professionnel seront supprimées.</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, les données du profil professionnel seront supprimées.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Cet appareil est géré."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"En savoir plus"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos et vidéos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musique et audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Désactivé"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musique"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Application de remplissage automatique"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 249d2c2..7a67986 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les SMS ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des SMS sera partagé avec cet utilisateur."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informations d\'urgence"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informations et contacts pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran."</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer la modification effectuée par Telephony Monitor, redémarrez l\'appareil"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL avec mécanisme Binder (nécessite un redémarrage)"</string>
     <string name="usage" msgid="2977875522080448986">"Consommation"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global défini"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'administrateur peut supprimer toutes les données de l\'appareil"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Toutes les données de l\'appareil sont ensuite supprimées</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Toutes les données de l\'appareil sont ensuite supprimées</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Les données du profil professionnel sont ensuite supprimées</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Les données du profil professionnel sont ensuite supprimées</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Cet appareil est géré."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"En savoir plus"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos et vidéos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musique et audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire d\'espace de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Désactivé"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musique"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinstallé pour utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Application de saisie automatique"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 61d3108..98f8cbd 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O historial de chamadas e SMS compartirase con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emerxencia"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Información e contactos para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar axustes aplicación"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar o cambio de cor, apaga a pantalla"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar o cambio do monitor de telefonía, reinicia o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizacións automáticas do sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (require reinicio)"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Configurouse o proxy HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e restablecer o contrasinal"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os datos do dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_1">%d</xliff:g> antes de eliminar todos os datos do dispositivo</item>
+      <item quantity="one">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_0">%d</xliff:g> antes de eliminar todos os datos do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_1">%d</xliff:g> antes de eliminar os datos do perfil de traballo</item>
+      <item quantity="one">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_0">%d</xliff:g> antes de eliminar os datos do perfil de traballo</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este é un dispositivo xestionado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo está xestionado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Máis información"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Xogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicacións"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xestor de almacenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"desactiv."</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"activado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Xogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicación de autocompletar"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3faa30b..df6c711 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"સ્થાન સંચાલિત કરો"</string>
     <string name="filter" msgid="2018011724373033887">"ફિલ્ટર"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ફિલ્ટર વિકલ્પો પસંદ કરો"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"બધી ઍપ્લિકેશનો"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"અક્ષમ કરેલી ઍપ્લિકેશનો"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ડાઉનલોડ કરેલા"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ચાલે છે"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB સંગ્રહ"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> બાકી"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ચાર્જ થવામાં <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"સ્ક્રીન દ્વારા વપરાશ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી ઍપ્લિકેશન દ્વારા વપરાશ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"છેલ્લે સંપૂર્ણ ચાર્જ પછી ઉપકરણ દ્વારા કરાયેલ વપરાશ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"અનપ્લગ થયું ત્યારથી બૅટરી ઉપયોગ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"રીસેટ પછીનો બૅટરી ઉપયોગ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"બૅટરી પર <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s સુધી વપરાઈ"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"કુલ બૅટરીમાંથી %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"છેલ્લા પૂર્ણ ચાર્જ પછીના વપરાશનું વિશ્લેષણ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"અંદાજિત બાકી સમય"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"સંપૂર્ણ ચાર્જ થવામાં બાકી સમય"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ફોન કૉલ્સ અને SMS ચાલુ કરીએ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"કૉલ અને SMS ઇતિહાસ આ વપરાશકર્તા સાથે શેર કરવામાં આવશે."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"કટોકટી માહિતી"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટે માહિતી અને સંપર્કો"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ઍપ્લિકેશનો અને સામગ્રીને મંજૂરી આપો"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"પ્રતિબંધો ધરાવતી ઍપ્લિકેશનો"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ઍપ્લિકેશન માટે સેટિંગ્સ વિસ્તૃત કરો"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ડિફૉલ્ટ કાર્ય સૂચના ટોન"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ડિફૉલ્ટ કાર્ય એલાર્મ રિંગટોન"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"વ્યક્તિગત પ્રોફાઇલની જેમ જ"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"વ્યક્તિગત પ્રોફાઇલ ધ્વનિનો ઉપયોગ કરીએ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"બદલો"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"તમારી વર્તમાન કાર્ય પ્રોફાઇલના ધ્વનિને બદલે તમારી વ્યક્તિગત પ્રોફાઇલના ધ્વનિ ઉપયોગમાં લેવાશે"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"રિંગટોન"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"અન્ય ધ્વનિ અને વાઇબ્રેશન"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"સૂચના પસંદગીઓ"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"કોઈ પરવાનગીઓ આપેલ નથી"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"કોઈ પરવાનગીઓની વિનંતી કરેલ નથી"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"બધી ઍપ્લિકેશનો"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ઇન્સ્ટૉલ કરેલી ઍપ્લિકેશનો"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ઝટપટ ઍપ્લિકેશનો"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"વ્યક્તિગત"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"કાર્યાલય"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"અવરોધિત"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"કૂલ રંગ તાપમાન"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"રંગ ફેરફાર લાગુ કરવા માટે, સ્ક્રીન બંધ કરો"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor ના ફેરફારો લાગુ કરવા, ઉપકરણને રીબૂટ કરો"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"સ્વચાલિત સિસ્ટમ અપડેટ્સ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL (રીબૂટ આવશ્યક)"</string>
     <string name="usage" msgid="2977875522080448986">"વપરાશ"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"વૈશ્વિક HTTP પ્રોક્સી સેટ કરી"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"વ્યવસ્થાપક ઉપકરણને લૉક કરી શકે છે અને પાસવર્ડ ફરીથી સેટ કરી શકે છે"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"વ્યવસ્થાપક ઉપકરણમાંનો બધો ડેટા કાઢી નાખી શકે છે"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">ઉપકરણનો બધો ડેટા કાઢી નાખતા પહેલા વ્યવસ્થાપકે પાસવર્ડના મહત્તમ પ્રયાસો <xliff:g id="COUNT_1">%d</xliff:g> પર સેટ કર્યાં</item>
+      <item quantity="other">ઉપકરણનો બધો ડેટા કાઢી નાખતા પહેલા વ્યવસ્થાપકે પાસવર્ડના મહત્તમ પ્રયાસો <xliff:g id="COUNT_1">%d</xliff:g> પર સેટ કર્યાં</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">બધો ડેટા કાઢી નાખતા પહેલા વ્યવસ્થાપકે પાસવર્ડના મહત્તમ પ્રયાસો <xliff:g id="COUNT_1">%d</xliff:g> પર સેટ કર્યાં</item>
+      <item quantity="other">બધો ડેટા કાઢી નાખતા પહેલા વ્યવસ્થાપકે પાસવર્ડના મહત્તમ પ્રયાસો <xliff:g id="COUNT_1">%d</xliff:g> પર સેટ કર્યાં</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"આ ઉપકરણ સંચાલિત છે."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"વધુ જાણો"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ફોટા અને વિડિઓઝ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"સંગીત અને ઑડિઓ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"રમતો"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"અન્ય ઍપ્લિકેશનો"</string>
     <string name="storage_files" msgid="8581083146777364063">"ફાઇલો"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"સ્ટોરેજ સંચાલક: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"બંધ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ચાલુ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"રમતો"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ઑડિઓ ફાઇલો"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"સંગીત"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> માટે અનઇન્સ્ટૉલ કરેલ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"સ્વતઃભરણ ઍપ્લિકેશન"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 773c45e..63cce3f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1135,16 +1135,16 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"इस <xliff:g id="NAME_0">^1</xliff:g> को सुरक्षित रूप से निकाल लिया गया है, लेकिन वह अभी भी उपलब्‍ध है. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने के लिए, आपको पहले उसे माउंट करना होगा."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"यह <xliff:g id="NAME_0">^1</xliff:g> दूषित है. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने के लिए, आपको पहले उसे सेट करना होगा."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"यह डिवाइस इस <xliff:g id="NAME_0">^1</xliff:g> का समर्थन नहीं करता. \n\nइस डिवाइस के साथ इस <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने के लिए, आपको पहले उसे सेट करना होगा."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"फ़ॉर्मेट करने के बाद, आप इस <xliff:g id="NAME_0">^1</xliff:g> का उपयोग अन्य डिवाइस में कर सकते हैं. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> में मौजूद संपूर्ण डेटा मिटा दिया जाएगा. सबसे पहले बैकअप लेने पर विचार करें. \n\n"<b>"फ़ोटो और अन्य मीडिया का बैकअप लें"</b>" \nअपनी मीडिया फ़ाइलों को इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं या USB केबल का उपयोग करके उन्हें किसी कंप्यूटर में ट्रांसफर करें. \n\n"<b>"ऐप्स का बैकअप लें"</b>" \nइस <xliff:g id="NAME_6">^1</xliff:g> में संग्रहीत सभी ऐप्स को अनइंस्टॉल कर दिया जाएगा और उनका डेटा मिटा दिया जाएगा. इन ऐप्स को बनाए रखने के लिए, उन्हें इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं."</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"जब आप इस <xliff:g id="NAME_0">^1</xliff:g> को निकालते हैं, तो इस पर संग्रहीत ऐप्‍स काम करना बंद कर देंगे और इस पर संग्रहीत मीडिया फ़ाइलें इसे पुन: लगाए जाने तक उपलब्‍ध नहीं होंगी."</b>" \n\nइस <xliff:g id="NAME_1">^1</xliff:g> को केवल इसी डिवाइस पर काम करने के लिए प्रारूपित किया गया है. यह किसी भी अन्‍य पर काम नहीं करेगा."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्‍स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्‍पिक रूप से, यदि डिवाइस उपलब्‍ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्‍स पुन: इंस्‍टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहीत किया गया उनका डेटा खो जाएगा."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"फ़ॉर्मेट करने के बाद, आप इस <xliff:g id="NAME_0">^1</xliff:g> का उपयोग अन्य डिवाइस में कर सकते हैं. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> में मौजूद संपूर्ण डेटा मिटा दिया जाएगा. सबसे पहले बैकअप लेने पर विचार करें. \n\n"<b>"फ़ोटो और अन्य मीडिया का बैकअप लें"</b>" \nअपनी मीडिया फ़ाइलों को इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं या USB केबल का उपयोग करके उन्हें किसी कंप्यूटर में ट्रांसफर करें. \n\n"<b>"ऐप्स का बैकअप लें"</b>" \nइस <xliff:g id="NAME_6">^1</xliff:g> में संग्रहित सभी ऐप्स को अनइंस्टॉल कर दिया जाएगा और उनका डेटा मिटा दिया जाएगा. इन ऐप्स को बनाए रखने के लिए, उन्हें इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं."</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"जब आप इस <xliff:g id="NAME_0">^1</xliff:g> को निकालते हैं, तो इस पर संग्रहित ऐप्‍स काम करना बंद कर देंगे और इस पर संग्रहित मीडिया फ़ाइलें इसे पुन: लगाए जाने तक उपलब्‍ध नहीं होंगी."</b>" \n\nइस <xliff:g id="NAME_1">^1</xliff:g> को केवल इसी डिवाइस पर काम करने के लिए प्रारूपित किया गया है. यह किसी भी अन्‍य पर काम नहीं करेगा."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्‍स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्‍पिक रूप से, यदि डिवाइस उपलब्‍ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्‍स पुन: इंस्‍टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहित किया गया उनका डेटा खो जाएगा."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहीत सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप्स"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"चित्र"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"वीडियो"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
-    <string name="storage_detail_cached" msgid="8547136365247818567">"संग्रहीत डेटा"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"संग्रहित डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्‍सप्‍लोर करें"</string>
@@ -1155,11 +1155,11 @@
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल मेमोरी के रूप में उपयोग करें"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"फ़ोटो और अन्य मीडिया को डिवाइसों के बीच ले जाने के लिए."</string>
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"आंतरिक मेमोरी के रूप में उपयोग करें"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ऐप्स और फ़ोटो सहित किसी भी चीज़ को केवल इसी डिवाइस में संग्रहीत करने के लिए. ऐसी फ़ॉर्मेटिंग आवश्यक है जो उसे अन्य डिवाइस के साथ काम करने से रोकती है."</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ऐप्स और फ़ोटो सहित किसी भी चीज़ को केवल इसी डिवाइस में संग्रहित करने के लिए. ऐसी फ़ॉर्मेटिंग आवश्यक है जो उसे अन्य डिवाइस के साथ काम करने से रोकती है."</string>
     <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"आंतरिक मेमोरी जैसे फ़ॉर्मेट करें"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को सुरक्षित करने हेतु उसे फ़ॉर्मेट करना आवश्यक है. \n\nफ़ॉर्मेट करने के बाद, यह <xliff:g id="NAME_1">^1</xliff:g> केवल इसी डिवाइस में काम करेगा. \n\n"<b>"फ़ॉर्मेट करने से <xliff:g id="NAME_2">^1</xliff:g> में वर्तमान में संग्रहीत संपू्र्ण डेटा मिट जाता है."</b>" डेटा खो जाने से बचाने के लिए, उसका बैकअप लेने पर विचार करें."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को सुरक्षित करने हेतु उसे फ़ॉर्मेट करना आवश्यक है. \n\nफ़ॉर्मेट करने के बाद, यह <xliff:g id="NAME_1">^1</xliff:g> केवल इसी डिवाइस में काम करेगा. \n\n"<b>"फ़ॉर्मेट करने से <xliff:g id="NAME_2">^1</xliff:g> में वर्तमान में संग्रहित संपू्र्ण डेटा मिट जाता है."</b>" डेटा खो जाने से बचाने के लिए, उसका बैकअप लेने पर विचार करें."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"पोर्टेबल संग्रह जैसा प्रारूपित करें"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को प्रारूपित किए जाने की आवश्‍यकता है. \n\n"<b>"प्रारूपित करने से वर्तमान में <xliff:g id="NAME_1">^1</xliff:g> पर संग्रहीत सभी डेटा मिट जाता है."</b>" डेटा खोने से बचाने के लिए, उसका बैक अप लेने पर विचार करें."</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को प्रारूपित किए जाने की आवश्‍यकता है. \n\n"<b>"प्रारूपित करने से वर्तमान में <xliff:g id="NAME_1">^1</xliff:g> पर संग्रहित सभी डेटा मिट जाता है."</b>" डेटा खोने से बचाने के लिए, उसका बैक अप लेने पर विचार करें."</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटाएं और फ़ॉर्मेट करें"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
@@ -2025,7 +2025,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय प्रमाणिकता"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
     <string name="user_credentials" msgid="3719013347787187083">"उपयोगकर्ता प्रमाणिकता"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"संग्रहीत प्रमाणिकता देखें और बदलाव करें"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"संग्रहित प्रमाणिकता देखें और बदलाव करें"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"अतिरिक्त सेटिंग"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"मेमोरी का प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
@@ -2058,11 +2058,11 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"अपने आप डेटा रिस्टोर करें"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी ऐप्स को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"बैकअप सेवा निष्‍क्रिय है."</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहीत नहीं कर रहा है"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहित नहीं कर रहा है"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने वाई-फ़ाई  पासवर्ड, बुकमार्क, अन्य सेटिंग और ऐप्स डेटा को सुरक्षित रखें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे सेटिंग और ऐप्स द्वारा संग्रहीत फ़ाइलों) का बैक अप लेना बंद करें, साथ ही रिमोट सर्वर से सभी प्रतियां मिटाएं?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"दूरस्थ रूप से अपने आप डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे ऐप्स द्वारा संग्रहीत सेटिंग और फ़ाइलों) का बैक अप लें.\n\nजब आप स्वचालित बैकअप चालू करते हैं, तो डिवाइस और ऐप डेटा को दूरस्थ रूप से समय-समय पर सहेजा जाता है. ऐप डेटा कोई भी ऐसा डेटा हो सकता है जिसे किसी ऐप द्वारा सहेजा गया है (डेवलपर सेटिंग के आधार पर), जिसमें संभावित रूप से संवेदनशील डेटा जैसे संपर्क, संदेश और फ़ोटो शामिल हैं."</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे सेटिंग और ऐप्स द्वारा संग्रहित फ़ाइलों) का बैक अप लेना बंद करें, साथ ही रिमोट सर्वर से सभी प्रतियां मिटाएं?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"दूरस्थ रूप से अपने आप डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे ऐप्स द्वारा संग्रहित सेटिंग और फ़ाइलों) का बैक अप लें.\n\nजब आप स्वचालित बैकअप चालू करते हैं, तो डिवाइस और ऐप डेटा को दूरस्थ रूप से समय-समय पर सहेजा जाता है. ऐप डेटा कोई भी ऐसा डेटा हो सकता है जिसे किसी ऐप द्वारा सहेजा गया है (डेवलपर सेटिंग के आधार पर), जिसमें संभावित रूप से संवेदनशील डेटा जैसे संपर्क, संदेश और फ़ोटो शामिल हैं."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"डिवाइस की व्‍यवस्‍थापन सेटिंग"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"डिवाइस नियंत्रक"</string>
     <string name="remove_device_admin" msgid="7736174723276745230">"इस डिवाइस व्यवस्थापक को निष्क्रिय करें"</string>
@@ -2079,7 +2079,7 @@
     <string name="device_admin_warning" msgid="2026747446313628233">"इस व्‍यवस्‍थापक को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्स निम्न कार्य कर सकेगा:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"यह व्‍यवस्‍थापक सक्रिय है और ऐप्स <xliff:g id="APP_NAME">%1$s</xliff:g> को निम्‍न कार्य करने देता है:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाइल प्रबंधक सक्रिय करें?"</string>
-    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"आगे बढ़ने से, आपके उपयोगकर्ता को आपके व्यवस्थापक द्वारा प्रबंधित किया जाएगा जो आपके व्यक्तिगत डेटा के अलावा संबद्ध डेटा भी संग्रहीत कर सकेगा.\n\nआपके व्यवस्थापक के पास नेटवर्क गतिविधि और आपके डिवाइस की स्थान जानकारी सहित इस उपयोगकर्ता से संबद्ध सेटिंग, एक्सेस, ऐप्स और डेटा की निगरानी करने की क्षमता होती है."</string>
+    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"आगे बढ़ने से, आपके उपयोगकर्ता को आपके व्यवस्थापक द्वारा प्रबंधित किया जाएगा जो आपके व्यक्तिगत डेटा के अलावा संबद्ध डेटा भी संग्रहित कर सकेगा.\n\nआपके व्यवस्थापक के पास नेटवर्क गतिविधि और आपके डिवाइस की स्थान जानकारी सहित इस उपयोगकर्ता से संबद्ध सेटिंग, एक्सेस, ऐप्स और डेटा की निगरानी करने की क्षमता होती है."</string>
     <string name="admin_disabled_other_options" msgid="4564776259414246934">"अन्य विकल्पों को आपके व्यवस्थापक द्वारा अक्षम किया गया है."</string>
     <string name="admin_more_details" msgid="7901420667346456102">"अधिक विवरण"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"शीर्षक-रहित"</string>
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और SMS चालू करें?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और SMS इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपातकालीन जानकारी"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> की जानकारी और संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अधिक शीतल प्रदर्शन रंगों का उपयोग करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलीफ़ोनी मॉनिटर बदलाव लागू करने के लिए, डिवाइस को रीबूट करें"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित सिस्टम अपडेट"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"बाइंड किए गए HAL (फिर से बूट करना ज़रूरी है)"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"वैश्विक HTTP प्रॉक्सी सेट है"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"व्यवस्थापक डिवाइस को लॉक कर सकता है और पासवर्ड को रीसेट कर सकता है"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"व्यवस्थापक डिवाइस का सभी डेटा हटा सकता है"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">डिवाइस का सभी डेटा हटाने से पहले व्यवस्थापक ने गलत पासवर्ड डालने के प्रयासों की अधिकतम संख्या <xliff:g id="COUNT_1">%d</xliff:g> तय कर दी है</item>
+      <item quantity="other">डिवाइस का सभी डेटा हटाने से पहले व्यवस्थापक ने गलत पासवर्ड डालने के प्रयासों की अधिकतम संख्या <xliff:g id="COUNT_1">%d</xliff:g> तय कर दी है</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">कार्य प्रोफ़ाइल डेटा हटाने से पहले व्यवस्थापक ने गलत पासवर्ड डालने के अधिकतम प्रयासों की संख्या <xliff:g id="COUNT_1">%d</xliff:g> तय कर दी है</item>
+      <item quantity="other">कार्य प्रोफ़ाइल डेटा हटाने से पहले व्यवस्थापक ने गलत पासवर्ड डालने के अधिकतम प्रयासों की संख्या <xliff:g id="COUNT_1">%d</xliff:g> तय कर दी है</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"यह डिवाइस प्रबंधित है."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जानें"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"फ़ोटो और वीडियो"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"संगीत और ऑडियो"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य ऐप्लिकेशन"</string>
     <string name="storage_files" msgid="8581083146777364063">"फ़ाइलें"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडियो फ़ाइलें"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अनइंस्टॉल है)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अक्षम है)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ऑटोमैटिक भरने का ऐप्लिकेशन"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7139eb3..6bab86f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2453,8 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Želite li uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Povijest poziva i SMS-ova dijelit će se s tim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije u hitnom slučaju"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dopuštanje aplikacija i sadržaja"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
@@ -3172,8 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primijenili promjenu boje, isključite zaslon"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da biste primijenili promjenu koju je izvršio TelephonyMonitor, ponovo pokrenite uređaj."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sustava"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Uvezani (binderized) HAL-ovi (zahtijeva ponovno pokretanje)"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -3424,14 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Postavljen je globalni HTTP proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator može zaključati uređaj i poništiti zaporku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može izbrisati sve podatke na uređaju"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja svih podataka s uređaja</item>
+      <item quantity="few">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja svih podataka s uređaja</item>
+      <item quantity="other">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja svih podataka s uređaja</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja podataka radnog profila</item>
+      <item quantity="few">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja podataka radnog profila</item>
+      <item quantity="other">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja podataka radnog profila</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ovo je upravljani uređaj."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografije i videozapisi"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Glazba i zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ostale aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
@@ -3442,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohrane: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiodatoteke"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Glazba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija za automatsko popunjavanje"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bc9af15..4ed0167 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Engedélyezi a hívásokat és SMS-eket?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"A rendszer megosztja az SMS- és híváslistát ezzel a felhasználóval."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Segélyhívási információk"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Adatok és névjegyek: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Alkalmazásbeállítás megnyitása"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"A színmódosítások alkalmazásához kapcsolja ki a képernyőt"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"A telefonos szolgáltatások figyelésének módosításához indítsa újra az eszközt"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatikus rendszerfrissítések"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binder osztályú HAL-ok (újraindítás szükséges)"</string>
     <string name="usage" msgid="2977875522080448986">"Használat"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globális HTTP proxy beállítva"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"A rendszergazda zárolhatja az eszközt, és módosíthatja a jelszót"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"A rendszergazda törölheti az összes adatot az eszközről"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_1">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné az összes eszközadatot</item>
+      <item quantity="one">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_0">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné az összes eszközadatot</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_1">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné a munkaprofil adatait</item>
+      <item quantity="one">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_0">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné a munkaprofil adatait</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ez az eszköz felügyelt."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Az eszközt a következő szervezet kezeli: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"További információ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fényképek és videók"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Zene és hang"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Játékok"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Egyéb alkalmazások"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fájlok"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tárhelykezelő: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Ki"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Be"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Játékok"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Hangfájlok"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Zenék"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(eltávolítva <xliff:g id="USER">%s</xliff:g> esetében)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(letiltva <xliff:g id="USER">%s</xliff:g> számára)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automatikus kitöltést végző alkalmazás"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 8d11bb3..1a258d0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1137,7 +1137,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Այս սարքը չի աջակցում <xliff:g id="NAME_0">^1</xliff:g>-ը: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ը այս սարքի հետ օգտագործելու համար անհրաժեշտ է նախ կարգավորել այն:"</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Ձևաչափումից հետո այս <xliff:g id="NAME_0">^1</xliff:g>-ը կարող եք օգտագործել այլ սարքերում: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ի վրայի բոլոր տվյալները կջնջվեն: Ուստի, չմոռանաք նախ պահուստավորել: \n\n"<b>"Պահուստավորեք լուսանկարներն ու այլ մեդիա ֆայլերը"</b>" \nՏեղափոխեք մեդիա ֆայլերը այս սարքի մեկ այլ պահեստ կամ որևէ համակարգիչ USB մալուխի միջոցով: \n\n"<b>"Պահուստավորեք հավելվածները"</b>" \nԱյս <xliff:g id="NAME_6">^1</xliff:g>-ի վրայի բոլոր հավելվածները ապատեղադրվելու են, իսկ նրանց տվյալները ջնջվելու են: Հավելվածները պահպանելու համար տեղափոխեք դրանք այս սարքի մեկ այլ պահեստ:"</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Եթե հանեք այս <xliff:g id="NAME_0">^1</xliff:g>-ը, նրա վրա պահեստավորված հավելվածներն այլևս չեն աշխատի, իսկ մեդիա ֆայլերը հասանելի չեն լինի մինչև նորից չզետեղեք այն:"</b>" \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ը ձևաչափված է միայն այս սարքի վրա աշխատելու համար: Այն չի աշխատի այլ սարքերի վրա:"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Այս <xliff:g id="NAME">^1</xliff:g>-ում առկա հավելվածները, լուսանկարները կամ տվյալները օգտագործելու համար հանեք և նորից զետեղեք այն: \n\nԻնչպես նաև, կարող եք հեռացնել այս պահեստը, եթե սարքն անհասանելի է: \n\nԵթե նախընտրեք հեռացնել այն, սարքի վրայի բոլոր տվյալները մշտապես կկորեն: \n\nԿարող եք հետագայում նորից տեղադրել հավելվածները, բայց այս սարքի վրա պահեստավորված նրանց տվյալները կկորեն:"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Այս <xliff:g id="NAME">^1</xliff:g>-ում առկա հավելվածները, լուսանկարները կամ տվյալները օգտագործելու համար հանեք և նորից զետեղեք այն: \n\nԻնչպես նաև, կարող եք հեռացնել այս պահեստը, եթե սարքն անհասանելի է: \n\nԵթե նախընտրեք հեռացնել այն, սարքի վրայի բոլոր տվյալները մշտապես կկորչեն: \n\nԿարող եք հետագայում նորից տեղադրել հավելվածները, բայց այս սարքի վրա պահեստավորված նրանց տվյալները կկորչեն:"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Մոռանա՞լ <xliff:g id="NAME">^1</xliff:g> սարքը:"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Այս <xliff:g id="NAME">^1</xliff:g> սարքում պահվող բոլոր հավելվածները, լուսանկարները և տվյալները ընդմիշտ ջնջվելու են:"</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Հավելվածներ"</string>
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Միացնե՞լ հեռախոսազանգերն ու SMS-ները:"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտատիրոջը:"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Անհետաձգելի բուժօգնության տվյալներ"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> օգտվողի տվյալները և կոնտակտները"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ընդլայնել ծրագրի կարգավորումները"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Գույնի սառը ջերմաստիճան"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Գույնի փոփոխությունը կիրառելու համար անջատեք էկրանը"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Ավտոմատ համակարգային թարմացումներ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Բինդերացված HAL-ներ (պահանջում է վերագործարկում)"</string>
     <string name="usage" msgid="2977875522080448986">"Օգտագործում"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ընդհանուր HTTP պրոքսին կարգավորված է"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Ադմինիստրատորը կարող է կողպել սարքը և վերակայել գաղտնաբառը"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Ադմինիստրատորը կարող է ջնջել սարքի բոլոր տվյալները"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="other">Ադմինիստրատորը սահմանել է գաղտնաբառը մուտքագրելու առավելագույնը <xliff:g id="COUNT_1">%d</xliff:g> փորձ, որից հետո սարքի բոլոր տվյալները կջնջվեն</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="other">Ադմինիստրատորը սահմանել է գաղտնաբառը մուտքագրելու առավելագույնը <xliff:g id="COUNT_1">%d</xliff:g> փորձ, որից հետո աշխատանքային պրոֆիլի բոլոր տվյալները կջնջվեն</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Այս սարքը կառավարվում է։"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Այս սարքի կառավարիչն է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպությունը։"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Իմանալ ավելին"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Լուսանկարներ և տեսանյութեր"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Երաժշտություն և աուդիո"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Խաղեր"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Այլ հավելվածներ"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ֆայլեր"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Հիշողության կառավարիչ՝ <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Անջատված է"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Միացված է"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Խաղեր"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ձայնային ֆայլեր"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Երաժշտություն"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտվողի համար)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտվողի համար)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Ինքնալրացման հավելված"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 93384ed..d6919d5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Aktifkan panggilan telepon &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Riwayat panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasi darurat"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; kontak untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk menerapkan perubahan warna, nonaktifkan layar"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menerapkah perubahan monitor telefoni, reboot perangkat"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Pemutakhiran sistem otomatis"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL Terbinder (perlu reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global disetel"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin dapat mengunci perangkat dan menyetel ulang sandi"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin dapat menghapus semua data perangkat"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_1">%d</xliff:g> sebelum menghapus semua data perangkat</item>
+      <item quantity="one">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_0">%d</xliff:g> sebelum menghapus semua data perangkat</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_1">%d</xliff:g> sebelum menghapus data profil kerja</item>
+      <item quantity="one">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_0">%d</xliff:g> sebelum menghapus data profil kerja</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Perangkat ini dikelola."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Perangkat ini dikelola oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Pelajari lebih lanjut"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto &amp; Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Game"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Aplikasi lainnya"</string>
     <string name="storage_files" msgid="8581083146777364063">"File"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengelola Penyimpanan: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Nonaktif"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktif"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Game"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(di-uninstal untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dinonaktifkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikasi IsiOtomatis"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c4a4de7..0a93b76 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kveikja á símtölum og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Símtala- og SMS-ferli verður deilt með þessum notanda."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Neyðarupplýsingar"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Upplýsingar og tengiliðir fyrir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leyfa forrit og innihald þeirra"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Forrit með takmörkunum"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Stækka stillingar forrits"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Slökktu á skjánum til að virkja litbreytinguna"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Til að breyta fjarskiptaumsjón skaltu endurræsa tækið"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sjálfvirkar kerfisuppfærslur"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Bundið HAL (krefst endurræsingar)"</string>
     <string name="usage" msgid="2977875522080448986">"Notkun"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Altækur HTTP-staðgengilsþjónn stilltur"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Kerfisstjóri getur læst tækinu og endurstillt aðgangsorðið"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Kerfisstjóri getur eytt öllum gögnum á tækinu"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum á tækinu verður eytt</item>
+      <item quantity="other">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum á tækinu verður eytt</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum vinnusniðs verður eytt</item>
+      <item quantity="other">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum vinnusniðs verður eytt</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Þessu tæki er stýrt."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Þessu tæki er stýrt af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Frekari upplýsingar"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Myndir og myndskeið"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Tónlist og hljóð"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Leikir"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Önnur forrit"</string>
     <string name="storage_files" msgid="8581083146777364063">"Skrár"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Geymsluumsjón: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Slökkt"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Kveikt"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Leikir"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Hljóðskrár"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Tónlist"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(fjarlægt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(óvirkt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Forrit fyrir sjálfvirka útfyllingu"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1e71e0d..c691975 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Desideri attivare chiamate e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informazioni per le emergenze"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info e contatti per <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Espandi impostazioni per app"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Per applicare la modifica ai colori, disattiva lo schermo"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per applicare la modifica a TelephonyMonitor, riavvia il dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Aggiornamenti di sistema automatici"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (richiede il riavvio)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizzo"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP globale impostato"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'amministratore può bloccare il dispositivo e reimpostare la password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'amministratore può eliminare tutti i dati del dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">L\'amministratore ha impostato <xliff:g id="COUNT_1">%d</xliff:g> tentativi massimi di inserimento della password prima dell\'eliminazione di tutti i dati del dispositivo.</item>
+      <item quantity="one">L\'amministratore ha impostato <xliff:g id="COUNT_0">%d</xliff:g> tentativo massimo di inserimento della password prima dell\'eliminazione di tutti i dati del dispositivo.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">L\'amministratore ha impostato <xliff:g id="COUNT_1">%d</xliff:g> tentativi massimi di inserimento della password prima dell\'eliminazione dei dati del profilo di lavoro.</item>
+      <item quantity="one">L\'amministratore ha impostato <xliff:g id="COUNT_0">%d</xliff:g> tentativo massimo di inserimento della password prima dell\'eliminazione dei dati del profilo di lavoro.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Questo dispositivo è gestito."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ulteriori informazioni"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto e video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musica e audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Giochi"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Altre app"</string>
     <string name="storage_files" msgid="8581083146777364063">"File"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestione memoria: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Non attiva"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Attiva"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Giochi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musica"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(disinstallato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App di compilazione automatica"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2755c9f..329e9d3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2476,8 +2476,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏האם להפעיל שיחות טלפון ו-SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏יבוצע שיתוף של היסטוריית השיחות וה-SMS עם המשתמש הזה."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"מידע למקרה חירום"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"המידע ואנשי הקשר של <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"אפשר אפליקציות ותוכן"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"אפליקציות והגבלות"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור האפליקציה"</string>
@@ -3205,8 +3204,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"טמפרטורת צבעים קרים"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"כבה את המסך כדי להחיל שינוי צבע"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"‏כדי להחיל את השינוי ב-Telephony Monitor, הפעל מחדש את המכשיר"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"עדכוני מערכת אוטומטיים"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏Binderized HALs (דורשת הפעלה מחדש)"</string>
     <string name="usage" msgid="2977875522080448986">"שימוש"</string>
@@ -3467,14 +3465,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏הוגדר שרת proxy גלובלי של HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"מנהל המערכת יכול לנעול את המכשיר ולאפס את הסיסמה"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"מנהל המערכת יכול למחוק את כל הנתונים מהמכשיר"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="two">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו כל הנתונים במכשיר</item>
+      <item quantity="many">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו כל הנתונים במכשיר</item>
+      <item quantity="other">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו כל הנתונים במכשיר</item>
+      <item quantity="one">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה פעם <xliff:g id="COUNT_0">%d</xliff:g>, יימחקו כל הנתונים במכשיר</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="two">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו הנתונים של פרופיל העבודה</item>
+      <item quantity="many">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו הנתונים של פרופיל העבודה</item>
+      <item quantity="other">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו הנתונים של פרופיל העבודה</item>
+      <item quantity="one">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה פעם <xliff:g id="COUNT_0">%d</xliff:g>, יימחקו הנתונים של פרופיל העבודה</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"המכשיר הזה מנוהל."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"מכשיר זה מנוהל על ידי <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"למידע נוסף"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"תמונות וסרטונים"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"מוזיקה ואודיו"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"משחקים"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"אפליקציות אחרות"</string>
     <string name="storage_files" msgid="8581083146777364063">"קבצים"</string>
@@ -3485,9 +3495,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"מנהל אחסון: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"כבוי"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"פועל"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"משחקים"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"קובצי אודיו"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"מוזיקה"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ההתקנה הוסרה אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"‏(WebView מושבתת אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"אפליקציית המילוי האוטומטי"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6647216..21d7a9f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"フィルタオプションの選択"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"すべてのアプリ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"無効になっているアプリ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ダウンロード済み"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"実行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBストレージ"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"残り<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"充電されるまで<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"画面使用"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"画面消費"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"前回のフル充電からのアプリの使用状況"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"前回のフル充電からの端末の使用状況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"リセット後の電池使用量"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池使用時間: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s、使用しました"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"電池全体の %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"前回のフル充電からの使用状況の内訳"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"予測される残り時間"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"フル充電までの時間"</string>
@@ -2444,8 +2436,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"通話とSMSをONにしますか？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話とSMSの履歴がこのユーザーと共有されます。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急情報"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> さんの情報と連絡先"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
@@ -2675,11 +2666,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"デフォルトの仕事用通知音"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"デフォルトの仕事用アラーム音"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"個人用プロファイルと共通"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"個人用プロファイルの音の使用"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"置換"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"現在の仕事用プロファイルの音の代わりに個人用プロファイルの音が使用されます"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"着信音"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"その他の音やバイブレーション"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知設定"</string>
@@ -2915,10 +2904,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"権限が付与されていません"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"リクエストされた権限はありません"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"すべてのアプリ"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"インストール済みアプリ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant Apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"仕事用"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ブロック中"</string>
@@ -3157,8 +3144,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"色の変更を適用するには、画面を OFF にしてください"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor の変更を適用するには、端末を再起動してください"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動システム アップデート"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL のバインダライゼーション（再起動が必要）"</string>
     <string name="usage" msgid="2977875522080448986">"使用量"</string>
@@ -3399,14 +3385,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"グローバル HTTP プロキシが設定されています"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理者は端末をロックしてパスワードを再設定できます"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理者は端末のすべてのデータを削除できます"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">管理者は、すべての端末データが削除されるまでのパスワードの有効入力回数を <xliff:g id="COUNT_1">%d</xliff:g> 回に設定しました</item>
+      <item quantity="one">管理者は、すべての端末データが削除されるまでのパスワードの有効入力回数を <xliff:g id="COUNT_0">%d</xliff:g> 回に設定しました</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">管理者は、仕事用プロファイル データが削除されるまでのパスワードの有効入力回数を <xliff:g id="COUNT_1">%d</xliff:g> 回に設定しました</item>
+      <item quantity="one">管理者は、仕事用プロファイル データが削除されるまでのパスワードの有効入力回数を <xliff:g id="COUNT_0">%d</xliff:g> 回に設定しました</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"この端末は管理されています。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"この端末は <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> により管理されています。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"詳細"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"写真＆動画"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音楽＆オーディオ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ゲーム"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"その他のアプリ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ファイル"</string>
@@ -3417,9 +3411,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ストレージ マネージャ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"OFF"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ON"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ゲーム"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音声ファイル"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音楽"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"（<xliff:g id="USER">%s</xliff:g> からアンインストール）"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（<xliff:g id="USER">%s</xliff:g> では無効）"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自動入力アプリ"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b0d0d7c..6a8d5e03f 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ჩაირთოს სატელეფონო ზარები &amp; amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ზარის და SMS ისტორია გაზიარდება ამ მომხმარებელთან."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"საგანგებო ინფორმაცია"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ინფორმაცია და კონტაქტები (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"აპებისა და კონტენტის დაშვება"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"აპლიკაციები შეზღუდვებით"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"აპლიკაციის პარამეტრების გაფართოება"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ფერთა ცვლილების მისასადაგებლად, გამორთეთ ეკრანი"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ტელეფონიის კონტროლიორთან დაკავშირებული ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"სისტემის ავტომატური განახლება"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (საჭიროებს გადატვირთვას)"</string>
     <string name="usage" msgid="2977875522080448986">"მოხმარება"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"გლობალური HTTP-პროქსი დაყენებულია"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ადმინისტრატორს მოწყობილობის ჩაკეტვა და პაროლის გადაყენება შეუძლია"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ადმინისტრატორს მოწყობილობაზე არსებული ყველა მონაცემის წაშლა შეუძლია"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ადმინისტრატორმა მოგცათ პაროლის შეყვანის <xliff:g id="COUNT_1">%d</xliff:g> მცდელობა, სანამ მოწყობილობაზე არსებული ყველა მონაცემი წაიშლება</item>
+      <item quantity="one">ადმინისტრატორმა მოგცათ პაროლის შეყვანის <xliff:g id="COUNT_0">%d</xliff:g> მცდელობა, სანამ მოწყობილობაზე არსებული ყველა მონაცემი წაიშლება</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">ადმინისტრატორმა მოგცათ პაროლის შეყვანის <xliff:g id="COUNT_1">%d</xliff:g> მცდელობა, სანამ სამსახურის პროფილის მონაცემები წაიშლება</item>
+      <item quantity="one">ადმინისტრატორმა მოგცათ პაროლის შეყვანის <xliff:g id="COUNT_0">%d</xliff:g> მცდელობა, სანამ სამსახურის პროფილის მონაცემები წაიშლება</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ეს მოწყობილობა მართულია."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ამ მოწყობილობას მართავს <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"შეიტყვეთ მეტი"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ფოტოები და ვიდეოები"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"მუსიკა და აუდიო"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"თამაშები"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"სხვა აპები"</string>
     <string name="storage_files" msgid="8581083146777364063">"ფაილები"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"მეხსიერების მენეჯერი: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"გამორთული"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ჩართული"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"თამაშები"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"აუდიო ფაილები"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"მუსიკა"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(დეინსტალირებულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(გათიშულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ავტომატური შევსების აპი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index ddf1420..6368dcc 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Телефон қоңырауларын және SMS қосу керек пе?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Қоңыраулар және SMS тарихы осы пайдаланушымен бөлісіледі."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Төтенше жағдайға арналған ақпарат"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ақпараты және контактілері"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Қолданбалар мен мазмұнға рұқсат беру"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Шектеулері бар қолданбалар"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Қолданба параметрлерін кеңейту"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Суық түс температурасы"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгерісін қолдану үшін экранды өшіріңіз"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматты жүйе жаңартулары"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL байланыстырылған модульдері (қайта жүктеу қажет)"</string>
     <string name="usage" msgid="2977875522080448986">"Трафик"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ғаламдық HTTP прокси-серверлер жиыны"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Әкімші құрылғыны құлыптап, құпия сөзді қайта орната алады"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Әкімші барлық құрылғы деректерін жоя алады"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Әкімші құпия сөзді енгізуді <xliff:g id="COUNT_1">%d</xliff:g> мүмкіндікпен шектеген, одан кейін барлық құрылғы деректері жойылады</item>
+      <item quantity="one">Әкімші құпия сөзді енгізуді <xliff:g id="COUNT_0">%d</xliff:g> мүмкіндікпен шектеген, одан кейін барлық құрылғы деректері жойылады</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Әкімші құпия сөзді енгізуді <xliff:g id="COUNT_1">%d</xliff:g> мүмкіндікпен шектеген, одан кейін жұмыс профилі деректері жойылады</item>
+      <item quantity="one">Әкімші құпия сөзді енгізуді <xliff:g id="COUNT_0">%d</xliff:g> мүмкіндікпен шектеген, одан кейін жұмыс профилі деректері жойылады</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Бұл құрылғыны ұйым басқарады."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> басқарады."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Толығырақ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Суреттер және бейнелер"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка және аудиомазмұн"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Ойындар"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Басқа қолданбалар"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Жад менеджері: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Өшірулі"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Қосулы"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Ойындар"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлдар"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Mузыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін жойылған)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін өшірілген)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Автотолтыру қолданбасы"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 8a987a5..dde298b 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"គ្រប់គ្រង​ទំហំ"</string>
     <string name="filter" msgid="2018011724373033887">"តម្រង"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ជ្រើស​ជម្រើស​ត្រង"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"កម្មវិធី​ទាំងអស់"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"កម្មវិធី​ដែល​បាន​បិទ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"បាន​ទាញ​យក"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"កំពុង​ដំណើរការ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"នៅ​សល់ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ដើម្បី​បញ្ចូល​ថ្ម"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"ការប្រើប្រាស់​អេក្រង់"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ការប្រើប្រាស់​អេក្រង់"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេន​បណ្ដាញ​ទូរសព្ទ​ចល័ត"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ការប្រើប្រាស់​កម្មវិធី​ចាប់​តាំង​ពី​សាកថ្ម​ពេញលើក​ចុង​ក្រោយ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ការប្រើប្រាស់​ឧបករណ៍​ចាប់​តាំង​ពី​សាកថ្ម​ពេញ​លើក​ចុងក្រោយ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ថ្ម​ដែល​បាន​ប្រើ​តាំង​ពី​លែង​បញ្ចូល"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ថ្មី​ប្រើ​តាំង​ពី​ពេល​កំណត់​ឡើង​វិញ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"បាន​ប្រើ​ថ្ម​អស់​រយៈពេល <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"បានប្រើ​អស់​រយៈពេល %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s នៃ​ថាមពល​ថ្ម​សរុប"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ព័ត៌មាន​លម្អិត​អំពី​ការប្រើប្រាស់​ថាមពល​ចាប់តាំង​ពី​សាក​ពេញ​រួចមក"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"រយៈពេល​នៅ​សល់​ប៉ាន់​ស្មាន"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"រយៈពេល​នៅសល់​រហូត​សាក​ពេញ"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"បើកការហៅទូរស័ព្ទ &amp; សារ SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ប្រវត្តិ​ហៅ និង​សារ SMS នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នកប្រើ​នេះ។"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ព័ត៌មានបន្ទាន់"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ព័ត៌មាន និង​ទំនាក់​ទំនង​សម្រាប់ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"អនុញ្ញាត​កម្មវិធី និង​មាតិកា"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"កម្មវិធី​មាន​ការ​ដាក់កម្រិត"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ពង្រីក​ការ​កំណត់​សម្រាប់​កម្មវិធី"</string>
@@ -2562,7 +2553,7 @@
       <item quantity="one">បង្ហាញធាតុ %d ដែលបានលាក់</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"បណ្តាញ និងអ៊ីនធឺណិត"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ឧបករណ៍​ចល័ត, ការ​ប្រើ​ប្រាស់ទិន្នន័យ, ហតស្ប៉ត"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi ឧបករណ៍​ចល័ត ការ​ប្រើ​ប្រាស់ទិន្នន័យ ហតស្ប៉ត"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ប៊្លូធូស, NFC, ភ្ជាប់"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
@@ -2578,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"លទ្ធផល"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ការតភ្ជាប់បណ្តាញ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"សារជាអក្សរ, សរសេរសារជាអក្សរ, ការផ្ញើសារ"</string>
-    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ចល័ត, ឧបករណ៍​ចល័ត, ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ, ឥត​ខ្សែ, ទិន្នន័យ, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ចល័ត ឧបករណ៍​ចល័ត ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ ឥត​ខ្សែ ទិន្នន័យ 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ហៅ, ការហៅ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"កម្មវិធី​ចាប់ផ្ដើម"</string>
     <string name="keywords_display" msgid="8910345814565493016">"អេក្រង់, ប៉ះអេក្រង់"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"សំឡេងជូនដំណឹងការងារលំនាំដើម"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"សំឡេងម៉ោងរោទិ៍ការងារលំនាំដើម"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ដូចគ្នានឹងប្រវត្តិរូបការងារ"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ប្រើ​សំឡេង​កម្រង​ព័ត៌មាន​ផ្ទាល់ខ្លួន?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ជំនួស"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"សំឡេង​កម្រង​ព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់​អ្នកនឹង​ត្រូវ​បាន​ប្រើ​ជំនួស​ឲ្យសំឡេង​កម្រង​ព័ត៌មាន​ការងារ​បច្ចុប្បន្ន​របស់​អ្នក"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"សំឡេង​រោទ៍"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"សំឡេង និង​ការ​ញ័រ​ផ្សេងទៀត"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ចំណូលចិត្តការជូនដំណឹង"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"គ្មានការផ្តល់សិទ្ធិអនុញ្ញាតទេ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"គ្មានការស្នើសិទ្ធិអនុញ្ញាតទេ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"កម្មវិធីទាំងអស់"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"កម្មវិធី​ដែល​បាន​ដំឡើង"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"កម្មវិធី​ប្រើ​ភ្លាមៗ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ផ្ទាល់ខ្លួន"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"កន្លែងធ្វើការ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"បានទប់ស្កាត់"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ដើម្បីប្តូរពណ៌ សូមបិទអេក្រង់"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ telephony monitor សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ការអាប់ដេតប្រព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (តម្រូវឲ្យ​ចាប់ផ្ដើម​ឡើង​វិញ)"</string>
     <string name="usage" msgid="2977875522080448986">"ការប្រើប្រាស់"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"បាន​កំណត់​ប្រូកស៊ី HTTP សកល"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"អ្នក​គ្រប់គ្រង​អាច​ចាក់សោ​ឧបករណ៍ និង​កំណត់​ពាក្យសម្ងាត់​ឡើងវិញ​បាន"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"អ្នក​គ្រប់គ្រង​អាច​លុប​ទិន្នន័យ​ឧបករណ៍​ទាំងអស់​បាន"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">អ្នក​គ្រប់គ្រង​បាន​កំណត់​ចំនួន​នៃ​ការព្យាយាម​បញ្ចូល​ពាក្យ​សម្ងាត់ <xliff:g id="COUNT_1">%d</xliff:g> ដង​ជាចំនួន​អតិបរមា មុន​ពេល​លុប​ទិន្នន័យ​ឧបករណ៍​ទាំងអស់</item>
+      <item quantity="one">អ្នក​គ្រប់គ្រង​បាន​កំណត់​ចំនួន​នៃ​ការព្យាយាម​បញ្ចូល​ពាក្យ​សម្ងាត់ <xliff:g id="COUNT_0">%d</xliff:g> ដង​ជាចំនួន​អតិបរមា មុន​ពេល​លុប​ទិន្នន័យ​ឧបករណ៍​ទាំងអស់</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">អ្នក​គ្រប់គ្រង​បាន​កំណត់​ចំនួន​នៃ​ការព្យាយាម​បញ្ចូល​ពាក្យ​សម្ងាត់ <xliff:g id="COUNT_1">%d</xliff:g> ដង​ជាចំនួន​អតិបរមា មុន​ពេល​លុប​ទិន្នន័យ​កម្រង​ព័ត៌មាន​ការងារ</item>
+      <item quantity="one">អ្នក​គ្រប់គ្រង​បាន​កំណត់​ចំនួន​នៃ​ការព្យាយាម​បញ្ចូល​ពាក្យ​សម្ងាត់ <xliff:g id="COUNT_0">%d</xliff:g> ដង​ជាចំនួន​អតិបរមា មុន​ពេល​លុប​ទិន្នន័យ​កម្រង​ព័ត៌មាន​ការងារ</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ឧបករណ៍​នេះ​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង។"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ឧបករណ៍​នេះ​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង​របស់ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ។"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ស្វែងយល់បន្ថែម"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"រូបថត និង​វីដេអូ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"តន្រ្តី និង​សំឡេង"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ហ្គេម"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"កម្មវិធី​ផ្សេង​ទៀត"</string>
     <string name="storage_files" msgid="8581083146777364063">"ឯកសារ"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"កម្មវិធី​គ្រប់គ្រង​ទំហំផ្ទុក៖ <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"បិទ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"បើក"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ហ្គេម"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ឯកសារ​សំឡេង"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"តន្ត្រី"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(បានលុប​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(បានបិទ​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"កម្មវិធី​បំពេញ​ស្វ័យប្រវត្តិ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 88d6b80..56b2f57 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ಸ್ಥಳ ನಿರ್ವಹಿಸಿ"</string>
     <string name="filter" msgid="2018011724373033887">"ಫಿಲ್ಟರ್‌"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ಫಿಲ್ಟರ್ ಆಯ್ಕೆಗಳನ್ನು ಆರಿಸಿ"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ಸಂಗ್ರಹಣೆ"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ಉಳಿದಿದೆ"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ಚಾರ್ಜ್‌ ಮಾಡಲು <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"ಪರದೆಯ ಬಳಕೆಗಾಗಿ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ಪರದೆ ಬಳಕೆ ಮಾಡಿದ್ದು"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ ನಂತರ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ಅನ್‌ಪ್ಲಗ್‌ ಆದಾಗಿನಿಂದ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ಮರುಹೊಂದಿಸಿದಾಗಿನಿಂದ ಬಳಕೆಯಾದ ಬ್ಯಾಟರಿ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ಬ್ಯಾಟರಿಯಲ್ಲಿ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ಗೆ ಬಳಸಲಾಗಿದೆ"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"ಒಟ್ಟು ಬ್ಯಾಟರಿ ಬಳಕೆಯ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಆದ ನಂತರ ಬಳಕೆಯಾದ ವಿವರ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"ಅಂದಾಜಿಸಿದ ಸಮಯ ಮುಗಿದಿದೆ"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡುವ ಸಮಯ"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ಫೋನ್ ಕರೆಗಳು &amp; SMS ಆನ್ ಮಾಡುವುದೇ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ಕರೆ ಮತ್ತು SMS ಇತಿಹಾಸವನ್ನು ಈ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತದೆ."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ತುರ್ತು ಮಾಹಿತಿ"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಗಾಗಿ ಮಾಹಿತಿ ಮತ್ತು ಸಂಪರ್ಕಗಳು"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳು ಮತ್ತು ವಿಷಯವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ನಿರ್ಬಂಧಗಳೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ಅಪ್ಲಿಕೇಶನ್‌ಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ವಿಸ್ತರಿಸಿ"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ಡಿಫಾಲ್ಟ್ ಕೆಲಸದ ಅಧಿಸೂಚನೆ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ಡಿಫಾಲ್ಟ್ ಕೆಲಸದ ಅಲಾರಮ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ರೀತಿಯಲ್ಲಿ"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬಳಸಬೇಕೆ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ಸ್ಥಾನಾಂತರಿಸು"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳ ಬದಲಾಗಿ ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ರಿಂಗ್‌ಟೋನ್‌ಗಳು"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ಇತರ ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ ಆದ್ಯತೆಗಳು"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ಅಧಿಸೂಚನೆ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿಲ್ಲ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ತತ್‌ಕ್ಷಣ ಆಪ್‌ಗಳು"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ತಂಪು ಬಣ್ಣದ ತಾಪಮಾನ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ಬಣ್ಣದ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಪರದೆ ಆಫ್ ಮಾಡಿ"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ದೂರವಾಣಿ ಮಾನಿಟರ್ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ಸ್ವಯಂಚಾಲಿತ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"ಬೈಂಡರ್ ಮಾಡಿದ HAL ಗಳು (ರಿಬೂಟ್ ಅಗತ್ಯವಿದೆ)"</string>
     <string name="usage" msgid="2977875522080448986">"ಬಳಕೆ"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ಜಾಗತಿಕ HTTP ಪ್ರಾಕ್ಸಿ ಸೆಟ್"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ನಿರ್ವಾಹಕರು ಸಾಧನವನ್ನು ಲಾಕ್ ಮಾಡಬಹುದು ಮತ್ತು ಪಾಸ್‌ವರ್ಡ್ ಹೊಂದಿಸಬಹುದು"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ನಿರ್ವಾಹಕರು ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಬಹುದು"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">ಸಾಧನದ ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸುವ ಮೊದಲು ನಿರ್ವಾಹಕರು ಗರಿಷ್ಠ ಪಾಸವರ್ಡ್‌ ಪ್ರಯತ್ನಗಳನ್ನು <xliff:g id="COUNT_1">%d</xliff:g> ಕ್ಕೆ ಹೊಂದಿಸಿದ್ದಾರೆ</item>
+      <item quantity="other">ಸಾಧನದ ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸುವ ಮೊದಲು ನಿರ್ವಾಹಕರು ಗರಿಷ್ಠ ಪಾಸವರ್ಡ್‌ ಪ್ರಯತ್ನಗಳನ್ನು <xliff:g id="COUNT_1">%d</xliff:g> ಕ್ಕೆ ಹೊಂದಿಸಿದ್ದಾರೆ</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಡೇಟಾ ಅಳಿಸುವ ಮೊದಲು ನಿರ್ವಾಹಕರು ಗರಿಷ್ಠ ಪಾಸವರ್ಡ್‌ ಪ್ರಯತ್ನಗಳನ್ನು <xliff:g id="COUNT_1">%d</xliff:g> ಕ್ಕೆ ಹೊಂದಿಸಿದ್ದಾರೆ</item>
+      <item quantity="other">ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಡೇಟಾ ಅಳಿಸುವ ಮೊದಲು ನಿರ್ವಾಹಕರು ಗರಿಷ್ಠ ಪಾಸವರ್ಡ್‌ ಪ್ರಯತ್ನಗಳನ್ನು <xliff:g id="COUNT_1">%d</xliff:g> ಕ್ಕೆ ಹೊಂದಿಸಿದ್ದಾರೆ</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ಈ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲಾಗಿದೆ."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳು"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"ಸಂಗೀತ ಮತ್ತು ಆಡಿಯೋ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ಆಟಗಳು"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="storage_files" msgid="8581083146777364063">"ಫೈಲ್‌ಗಳು"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ಸಂಗ್ರಹಣಾ ನಿರ್ವಾಹಕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ಆಫ್"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ಆನ್"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ಆಟಗಳು"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ಆಡಿಯೋ ಫೈಲ್‌ಗಳು"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ಸಂಗೀತ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ಅಸ್ಥಾಪಿಸಲಾಗಿದೆ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಅಪ್ಲಿಕೇಶನ್"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f9c11ee..326b1b0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"필터 옵션 선택"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"모든 앱"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"사용 중지된 앱"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"실행 중"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> 남음"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> 후 완충"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"화면 켜짐 상태 시간"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"화면 소비 전력"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"마지막 충전 완료 후 앱 사용"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"마지막 충전 완료 후 기기 사용"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"초기화 이후 배터리 사용"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"배터리 사용 시간: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s 동안 사용"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"전체 배터리 용량의 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"마지막 충전 완료 후 사용 내역 분석"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"남은 예상 시간"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"남은 충전 시간"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"통화 및 SMS 기능을 사용하시겠습니까?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"통화 및 SMS 기록이 이 사용자와 공유됩니다."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"긴급 상황 정보"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 정보 및 연락처"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"기본 직장 알림 톤"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"기본 직장 알람 벨소리"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"개인 프로필과 동일"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"개인 프로필 사운드 사용"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"바꾸기"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"현재 직장 프로필 사운드 대신 개인 프로필 사운드가 사용됩니다."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"벨소리"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"기타 소리 및 진동"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"알림 환경설정"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"부여된 권한이 없습니다."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"요청한 권한이 없습니다."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"모든 앱"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"설치된 앱"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"빠른 실행 앱"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"차단됨"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"차가운 색상 온도"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"색상 변경을 적용하려면 화면을 끄세요."</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"통신 모니터의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"자동 시스템 업데이트"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL(재부팅 필요)"</string>
     <string name="usage" msgid="2977875522080448986">"사용량"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"전체 HTTP 프록시 설정됨"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"관리자는 기기를 잠그고 비밀번호를 재설정할 수 있습니다."</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"관리자는 모든 기기 데이터를 삭제할 수 있습니다."</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">관리자가 비밀번호 입력에 <xliff:g id="COUNT_1">%d</xliff:g>회 실패 시 기기의 데이터가 모두 삭제되도록 설정했습니다.</item>
+      <item quantity="one">관리자가 비밀번호 입력에 <xliff:g id="COUNT_0">%d</xliff:g>회 실패 시 기기의 데이터가 모두 삭제되도록 설정했습니다.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">관리자가 비밀번호 입력에 <xliff:g id="COUNT_1">%d</xliff:g>회 실패 시 직장 프로필 데이터가 삭제되도록 설정했습니다.</item>
+      <item quantity="one">관리자가 비밀번호 입력에 <xliff:g id="COUNT_0">%d</xliff:g>회 실패 시 직장 프로필 데이터가 삭제되도록 설정했습니다.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"관리되는 기기입니다."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 관리하는 기기입니다."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"자세히 알아보기"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"사진 및 동영상"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"음악 및 오디오"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"게임"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"기타 앱"</string>
     <string name="storage_files" msgid="8581083146777364063">"파일"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"사용 안함"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"사용"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"게임"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"오디오 파일"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"음악"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>님의 경우 제거됨)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>님의 경우 사용 안함)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"자동완성 앱"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 0f9afa9..4b09a24 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2431,8 +2431,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Чалуулар менен SMS иштетилсинби?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Чалуу жана SMS таржымалы бул колдонуучу менен бөлүшүлөт."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Шашылыш кырдаал жөнүндө маалымат"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> жөнүндө маалымат жана байланыштар"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Колдонмолорго жана мазмунга уруксат"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Чектелген колдонмолор"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Колдонмонун тууралоолорун ачуу"</string>
@@ -3140,8 +3139,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Салкын температура түсү"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Салкыныраак дисплей түстөрүн колдонуңуз"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгөртүүлөрүн күчүнө киргизүү үчүн, экранды өчүрүңүз"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматтык тутум жаңыртуулары"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (өчүрүп-күйгүзүү талап кылынат)"</string>
     <string name="usage" msgid="2977875522080448986">"Колдонулушу"</string>
@@ -3382,14 +3380,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобалдык HTTP проксиси орнотулду"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администратор түзмөктү кулпулап, сырсөздү баштапкы абалга келтире алат"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администратор түзмөктүн бардык дайындарын жок кыла алат"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Сырсөздү <xliff:g id="COUNT_1">%d</xliff:g> жолу ката киргизгенден кийин түзмөктөгү бардык дайындар жок кылынат</item>
+      <item quantity="one">Сырсөздү <xliff:g id="COUNT_0">%d</xliff:g> жолу ката киргизгенден кийин түзмөктөгү бардык дайындар жок кылынат</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Сырсөздү <xliff:g id="COUNT_1">%d</xliff:g> жолу ката киргизгенден кийин жумуш профилиндеги бардык дайындар жок кылынат</item>
+      <item quantity="one">Сырсөздү <xliff:g id="COUNT_0">%d</xliff:g> жолу ката киргизгенден кийин жумуш профилиндеги бардык дайындар жок кылынат</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Бул түзмөктү ишкана башкарат."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Көбүрөөк маалымат"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Сүрөттөр жана видеолор"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка жана аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Оюндар"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Башка колдонмолор"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
@@ -3400,9 +3406,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сактагычты көзөмөлдөгүч: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Өчүк"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Күйүк"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Оюндар"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио файлдар"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> үчүн чыгарылып салынган)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> үчүн өчүрүлгөн)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Автотолтуруу колдонмосу"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 725e0b5..3ed8b69 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ຈັດການພື້ນທີ່"</string>
     <string name="filter" msgid="2018011724373033887">"ໂຕກັ່ນຕອງ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ເລືອກໂຕເລືອກການກັ່ນຕອງ"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"ແອັບທັງໝົດ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ແອັບທີ່ຖືກປິດການນຳໃຊ້"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ດາວໂຫລດແລ້ວ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ກຳລັງເຮັດວຽກ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"ເຫຼືອອີກ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ​ກ່ອນ​ຈະ​ເຕັມ"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"ການໃຊ້ໜ້າຈໍ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ການໃຊ້ພະລັງງານໄປກັບໜ້າຈໍ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ການນຳໃຊ້ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ການນຳໃຊ້ອຸປະກອນນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ການໃຊ້ແບັດເຕີຣີນັບຈາກການຣີເຊັດ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ໃຊ້ແບັດເຕີຣີມາ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"ໃຊ້ເປັນເວລາ %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ຂອງແບັດເຕີຣີໂດຍຮວມ"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ແຍກສ່ວນການນຳໃຊ້ນັບຕັ້ງແຕ່ສາກຈົນເຕັມເທື່ອຫຼ້າສຸດ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"ເວລາທີ່ເຫຼືອໂດຍປະມານ"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"ເວລາທີ່ໃຊ້ໃນການສາກໃຫ້ເຕັມ"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ເປີດ​ໂທ​ລະ​ສັບ &amp; SMS ບໍ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ປະ​ຫວັດ​ການ​ໂທ​ ແລະ ​ການ​ສົ່ງ SMS ຈະ​ຖືກ​ແບ່ງ​ປັນ​ໃຫ້​ກັບ​ຜູ້​ໃຊ້​ນີ້."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ຂໍ້ມູນສຸກເສີນ"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ຂໍ້ມູນ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ສຳລັບ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ອະນຸຍາດແອັບຯ ແລະເນື້ອຫາ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ແອັບພລິເຄຊັນທີ່ມີຂໍ້ຈຳກັດ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ຂະຫຍາຍການຕັ້ງຄ່າສຳລັບແອັບພລິເຄຊັນ"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ສຽງກນແຈ້ງເຕືອນບ່ອນເຮັດວຽກ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ຣິງໂທນປຸກບ່ອນເຮັດວຽກ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ຄືກັນກັບໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ໃຊ້ສຽງໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ແທນທີ່"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ສຽງໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານຈະຖືກໃຊ້ແທນສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກປັດຈຸບັນ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ຣິງໂທນ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ບໍ່ໄດ້ໃຫ້ການອະນຸຍາດໃດ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ບໍ່ມີການຮ້ອງຂໍການອະນຸຍາດໃດ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ແອັບທັງໝົດ"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ແອັບທີ່ຕິດຕັ້ງແລ້ວ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ອິນສະແຕນແອັບ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"​ສ່ວນ​ໂຕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ວຽກ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ບລັອກ​ແລ້ວ"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ອຸນຫະພູມສີເຢັນ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ເພື່ອນຳໃຊ້ການປ່ຽນສີ, ໃຫ້ປິດໜ້າຈໍ"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ Telephony Monitor, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ການອັບເດດລະບົບອັດຕະໂນມັດ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ຕ້ອງປິດແລ້ວເປີດໃໝ່)"</string>
     <string name="usage" msgid="2977875522080448986">"ການໃຊ້"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ຜູ້ເບິ່ງແຍງລະບົບສາມາດລັອກອຸປະກອນ ແລະ ຕັ້ງລະຫັດຜ່ານໃໝ່ໄດ້"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ຜູ້ເບິ່ງແຍງສາມາດລຶບຂໍ້ມູນອຸປະກອນທັງໝົດໄດ້"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ຜູ້ເບິ່ງແຍງໄດ້ຕັ້ງໃຫ້ພະຍາຍາມໃສ່ລະຫັດຜ່ານໄດ້ສູງສຸດ <xliff:g id="COUNT_1">%d</xliff:g> ເທື່ອກ່ອນລຶບຂໍ້ມູນອຸປະກອນອອກ</item>
+      <item quantity="one">ຜູ້ເບິ່ງແຍງໄດ້ຕັ້ງໃຫ້ພະຍາຍາມໃສ່ລະຫັດຜ່ານໄດ້ສູງສຸດ <xliff:g id="COUNT_0">%d</xliff:g> ເທື່ອກ່ອນລຶບຂໍ້ມູນອຸປະກອນອອກ</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">ຜູ້ເບິ່ງແຍງໄດ້ຕັ້ງໃຫ້ພະຍາຍາມໃສ່ລະຫັດຜ່ານໄດ້ສູງສຸດ <xliff:g id="COUNT_1">%d</xliff:g> ເທື່ອກ່ອນລຶບຂໍ້ມູນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກອອກ</item>
+      <item quantity="one">ຜູ້ເບິ່ງແຍງໄດ້ຕັ້ງໃຫ້ພະຍາຍາມໃສ່ລະຫັດຜ່ານໄດ້ສູງສຸດ <xliff:g id="COUNT_0">%d</xliff:g> ເທື່ອກ່ອນລຶບຂໍ້ມູນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກອອກ</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ອຸປະກອນນີ້ຖືກຈັດການຢູ່"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ສຶກສາເພີ່ມເຕີມ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ຮູບພາບ ແລະ ວິດີໂອ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ເກມ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ແອັບຯອື່ນໆ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ໄຟລ໌"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ປິດ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ເປີດ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ເກມ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ໄຟລ໌ສຽງ"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ດົນຕີ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ຖືກຖອນການຕິດຕັ້ງສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ຖຶືກປິດໄວ້ສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ແອັບຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 91c6500..0a2edf9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2474,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Įjungti telefono skambučius ir SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Skambučių ir SMS istorija bus bendrinama su šiuo naudotoju."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Kritinės padėties informacija"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> informacija ir kontaktai"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leisti programas ir turinį"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programos su apribojimais"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Išplėsti programos nustatymus"</string>
@@ -3205,8 +3204,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kad pritaikytumėte spalvos pakeitimą, išjunkite ekraną"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Kad pritaikytumėte telefonijos stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiniai sistemos naujiniai"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Susaistyti HAL (reikia paleisti iš naujo)"</string>
     <string name="usage" msgid="2977875522080448986">"Naudojimas"</string>
@@ -3467,14 +3465,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Nustatytas visuotinis HTTP tarpinis serveris"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratorius gali užrakinti įrenginį ir iš naujo nustatyti slaptažodį"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratorius gali ištrinti visus įrenginio duomenis"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+      <item quantity="few">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+      <item quantity="many">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+      <item quantity="other">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+      <item quantity="few">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+      <item quantity="many">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+      <item quantity="other">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Šis įrenginys tvarkomas."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Šį įrenginį tvarko „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Sužinoti daugiau"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Nuotraukos ir vaizdo įrašai"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzika ir garso įrašai"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Žaidimai"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Kitos programos"</string>
     <string name="storage_files" msgid="8581083146777364063">"Failai"</string>
@@ -3485,9 +3495,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Saugyklos tvarkytuvė: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Išjungta"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Įjungta"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Žaidimai"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Garso failai"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(pašalinta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(išjungta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automatinio pildymo programa"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4e2adbf..7449052 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1498,10 +1498,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izvēlēties filtra opcijas"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Visas lietotnes"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Atspējotās lietotnes"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Lejupielādēts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Darbojas"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB krātuve"</string>
@@ -1848,16 +1846,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Vēl <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Atlikušais uzlādes laiks: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekrāna lietojums"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Lietotnes lietojums kopš pēdējās pilnās uzlādes"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Ierīces lietojums kopš pēdējās pilnās uzlādes"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumulatora patēriņš kopš atiestatīšanas"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g>, izmantojot akumulatoru"</string>
@@ -1947,8 +1940,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Izmantots: %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s no vispārējā akumulatora lietojuma"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Lietojuma sadalījums kopš pēdējās pilnās uzlādes"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Plānotais atlikušais laiks"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Atlikušais laiks līdz pilnai uzlādei"</string>
@@ -2461,8 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vai ieslēgt tālruņa zvanus un īsziņas?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ar šo lietotāju tiks kopīgota zvanu un īsziņu vēsture."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Ārkārtas informācija"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>: informācija un kontaktpersonas"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lietotņu un satura atļaušana"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Lietojumprogrammas ar ierobežojumiem"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Izvērst lietojumprogr. iestat."</string>
@@ -2693,11 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Noklusējuma paziņojumu signāls"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Noklusējuma trauksmes signāls"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Tādi paši signāli kā personiskajā profilā"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vai lietot personiskā profila signālus?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Aizstāt"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Jūsu pašreizējā darba profila signālu vietā tiks lietoti jūsu personiskā profila signāli."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zvana signāli"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Citas skaņas un vibrācija"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Paziņojumu preferences"</string>
@@ -2939,10 +2928,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nav piešķirta neviena atļauja."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nav pieprasīta neviena atļauja."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Visas lietotnes"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalētās lietotnes"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Tūlītējās lietotnes"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Privātās"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Darba"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloķētie"</string>
@@ -3184,8 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Lai mainītu krāsas, izslēdziet ekrānu"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Lai lietotu telefonijas pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automātiski sistēmas atjauninājumi"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL sasaistīšana (nepieciešama atkārtota palaišana)"</string>
     <string name="usage" msgid="2977875522080448986">"Lietojums"</string>
@@ -3436,14 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ir iestatīts globālais HTTP starpniekserveris"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrators var bloķēt ierīci un atiestatīt paroli"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrators var dzēst visus ierīces datus"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="zero">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizes. Pēc tam tiks dzēsti visi ierīces dati.</item>
+      <item quantity="one">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizi. Pēc tam tiks dzēsti visi ierīces dati.</item>
+      <item quantity="other">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizi. Pēc tam tiks dzēsti visi ierīces dati.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="zero">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizes. Pēc tam tiks dzēsti darba profila dati.</item>
+      <item quantity="one">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizi. Pēc tam tiks dzēsti darba profila dati.</item>
+      <item quantity="other">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizes. Pēc tam tiks dzēsti darba profila dati.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Šī ierīce tiek pārvaldīta."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Šo ierīci pārvalda <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Uzzināt vairāk"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotoattēli un videoklipi"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Mūzika un audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spēles"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Citas lietotnes"</string>
     <string name="storage_files" msgid="8581083146777364063">"Faili"</string>
@@ -3454,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Krātuves pārvaldnieks: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Izslēgts"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ieslēgts"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spēles"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio faili"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Mūzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(atinstalēts lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(atspējots lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automātiskās aizpildes lietotne"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2b41961..35d3e9b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Вклучи телефонски повици и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историјата на повици и пораки ќе се сподели со овој корисник."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информации за итни случаи"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Информации и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи апликации и содржина"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликации со ограничувања"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подесувања за апликација"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ладна боја за температура"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да се примени промената на бојата, исклучете го екранот"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"За да се примени промената на мониторот за телефонија, рестартирајте го уредот"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматски ажурирања на системот"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Споени слоеви за апстракција на хардвер (бара рестартирање)"</string>
     <string name="usage" msgid="2977875522080448986">"Користење"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Поставен е глобален HTTP прокси"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администраторот може да го заклучи уредот и да ја ресетира лозинката"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администраторот може да ги избрише сите податоци на уредот"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Администраторот го постави максималниот број на обиди за лозинка на <xliff:g id="COUNT_1">%d</xliff:g> пред да се избришат сите податоци на уредот</item>
+      <item quantity="other">Администраторот го постави максималниот број на обиди за лозинка на <xliff:g id="COUNT_1">%d</xliff:g> пред да се избришат сите податоци на уредот</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Администраторот го постави максималниот број на обиди за лозинка на <xliff:g id="COUNT_1">%d</xliff:g> пред да се избришат податоците на работниот профил</item>
+      <item quantity="other">Администраторот го постави максималниот број на обиди за лозинка на <xliff:g id="COUNT_1">%d</xliff:g> пред да се избришат податоците на работниот профил</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Со уредов се управува."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> управува со уредов."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Дознајте повеќе"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фотографии и видеа"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика и аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Други апликации"</string>
     <string name="storage_files" msgid="8581083146777364063">"Датотеки"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"„Управник со меморија“: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Исклучен"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Вклучен"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио датотеки"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(оневозможено за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Апликација за автоматско пополнување"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0b5dbe2..f0cf6ae 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"സ്‌പെയ്സ് നിയന്ത്രിക്കുക"</string>
     <string name="filter" msgid="2018011724373033887">"ഫിൽട്ടർ ചെയ്യുക"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ഫിൽട്ടർ ഓപ്ഷനുകൾ തിരഞ്ഞെടുക്കുക"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"എല്ലാ ആപ്പുകളും"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പുകൾ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ഡൗൺലോഡുചെയ്തു"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"പ്രവര്‍ത്തിക്കുന്നു"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB സ്റ്റോറേജ്"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ശേഷിക്കുന്നു"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ചാർജ്ജാകാനുള്ള സമയം <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"സ്‌ക്രീൻ ഉപയോഗം"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"സ്‌ക്രീൻ ഉപഭോഗം"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യൽ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"അവസാനത്തെ പൂർണ്ണ ചാർജ്ജിംഗിനു‌ ശേഷമുള്ള ആപ്പിന്റെ ഉപഭോഗം"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ഉപകരണത്തിന്റെ അവസാനത്തെ പൂർണ്ണ ചാർജ്ജിംഗിനു‌ ശേഷമുള്ള ഉപഭോഗം"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്‌തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"പുനഃസജ്ജമാക്കിയതിന് ശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ബാറ്ററിയിൽ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ഉപയോഗിച്ചു"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"മൊത്തം ബാറ്ററിയുടെ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"അവസാന സമ്പൂർണ്ണ ‌ചാർജ്ജിംഗിന് ‌ശേഷമുള്ള ഉപയോഗത്തിന്റെ വിശദാംശങ്ങൾ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"അവശേഷിക്കുന്ന ഏകദേശ സമയം"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"മുഴുവൻ ചാർജ്ജാവാൻ വേണ്ട ‌സമയം"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ഫോൺ കോളുകൾ, SMS എന്നിവ ഓണാക്കണോ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ഈ ഉപയോക്താവുമായി കോൾ, SMS എന്നിവയുടെ ചരിത്രം പങ്കിടും."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"അടിയന്തര വിവരം"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്നയാൾക്കുള്ള വിവരങ്ങളും കോൺടാക്‌റ്റുകളും"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"അപ്ലിക്കേഷനുകളും ഉള്ളടക്കവും അനുവദിക്കുക"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"നിയന്ത്രണങ്ങളുള്ള അപ്ലിക്കേഷനുകൾ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"അപ്ലിക്കേഷനുകൾക്കായുള്ള ക്രമീകരണങ്ങൾ വിപുലീകരിക്കുക"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ഡിഫോൾട്ട് ഔദ്യോഗിക അറിയിപ്പ് ടോൺ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ഡിഫോൾട്ട് ഔദ്യോഗിക അലാറം റിംഗ്‌ടോൺ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"വ്യക്തിഗത പ്രൊഫൈലിന് സമാനം"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"വ്യക്തിഗത പ്രൊഫൈൽ ശബ്‌ദങ്ങൾ ഉപയോഗിക്കണോ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"മാറ്റിസ്ഥാപിക്കുക"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"നിങ്ങളുടെ നിലവിലെ ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്‌ദങ്ങൾക്ക് പകരം വ്യക്തിഗത പ്രൊഫൈൽ ശബ്‌ദങ്ങൾ ഉപയോഗിക്കുന്നതാണ്"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"റിംഗ്‌ടോണുകൾ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"മറ്റ് ശബ്ദങ്ങളും വൈബ്രേഷനുകളും"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"അറിയിപ്പ് മുൻഗണനകൾ"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"അനുമതികളൊന്നും അനുവദിച്ചില്ല"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"അനുമതികളൊന്നും അഭ്യർത്ഥിച്ചില്ല"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"എല്ലാ ആപ്സും"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ഇൻസ്‌റ്റാൾ ചെയ്‌ത ആപ്പുകൾ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ഇൻസ്‌റ്റ‌ന്റ് ആപ്പ്"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"വ്യക്തിഗതം"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ഔദ്യോഗികം"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"തടഞ്ഞവ"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"തണുത്ത വർണ്ണ താപനില"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"വർണ്ണ മാറ്റം ബാധകമാക്കാൻ, സ്ക്രീൻ ഓഫാക്കുക"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ടെലിഫോണി മോണിറ്ററിലെ മാറ്റം പ്രയോഗിക്കാൻ ഉപകരണം റീബൂട്ടുചെയ്യുക"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"സ്വയമേവയുള്ള സിസ്റ്റം അപ്ഡേറ്റുകൾ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"ബൈൻഡർ ചെയ്‌ത HAL-കൾ (റീബൂട്ട് ആവശ്യമാണ്)"</string>
     <string name="usage" msgid="2977875522080448986">"ഉപയോഗം"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ഗ്ലോബൽ HTTP പ്രോക്സി സെറ്റ്"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"അഡ്മിന് ഉപകരണം ‌ലോക്ക് ചെയ്യാനും പാസ്‌വേഡ് റീസെറ്റ് ചെയ്യാനും കഴിയും"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"അഡ്മിന് ഉപകരണത്തിലെ എല്ലാ ‌ഡാറ്റയും ഇല്ലാതാക്കാൻ ‌കഴിയും"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നതിനുമുമ്പുള്ള പരമാവധി ലോഗിൻ ശ്രമങ്ങൾ <xliff:g id="COUNT_1">%d</xliff:g> ആക്കി അഡ്‌മിൻ സജ്ജീകരിച്ചു.</item>
+      <item quantity="one">ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നതിനുമുമ്പുള്ള പരമാവധി ലോഗിൻ ശ്രമങ്ങൾ <xliff:g id="COUNT_0">%d</xliff:g> ആക്കി അഡ്‌മിൻ സജ്ജീകരിച്ചു.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">ഔദ്യോഗിക പ്രൊഫൈൽ ഡാറ്റ മായ്ക്കുന്നതിനുമുമ്പുള്ള പരമാവധി ലോഗിൻ ശ്രമങ്ങൾ <xliff:g id="COUNT_1">%d</xliff:g> ആക്കി അഡ്‌മിൻ സജ്ജീകരിച്ചു.</item>
+      <item quantity="one">ഔദ്യോഗിക പ്രൊഫൈൽ ഡാറ്റ മായ്ക്കുന്നതിനുമുമ്പുള്ള പരമാവധി ലോഗിൻ ശ്രമങ്ങൾ <xliff:g id="COUNT_0">%d</xliff:g> ആക്കി അഡ്‌മിൻ സജ്ജീകരിച്ചു.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ഈ ഉപകരണം ഉടമയാൽ ‌നിയന്ത്രിക്കപ്പെടുന്നു."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ഈ ഉപകരണം നിയന്ത്രിക്കുന്നത് <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ആണ്."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"കൂടുതലറിയുക"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ഫോട്ടോകളും വീഡിയോകളും"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"സംഗീതവും ഓഡിയോയും"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ഗെയിമുകള്‍"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"മറ്റ് ആപ്‌സ്"</string>
     <string name="storage_files" msgid="8581083146777364063">"ഫയലുകള്‍"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"സ്റ്റോറേജ് മാനേജര്‍: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ഓഫ്"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ഓൺ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ഗെയിമുകള്‍"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ഓഡിയോ ഫയലുകള്‍‌"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"സംഗീതം"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് ‌അൺഇൻസ്റ്റാൾചെയ്തു)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് കാണാനാവില്ല)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"സ്വയമേവ പൂരിപ്പിക്കുന്ന ആപ്പ്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b7d3d96..2de4134 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Эзэлсэн зайг удирдах"</string>
     <string name="filter" msgid="2018011724373033887">"Шүүлтүүр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Шүүлтүүрийн тохируулгыг сонгоно уу"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Бүх апп"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Идэвхгүй болгосон апп"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Татаж авсан"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Ажиллаж байна"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB сан"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> үлдсэн"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> цэнэглэх хүртэл"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Дэлгэц ашиглалт"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Дэлгэцийн хэрэглээ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Сүүлд бүрэн цэнэглэснээс хойших апп ашиглалт"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Сүүлд бүрэн цэнэглэснээс хойших төхөөрөмж ашиглалт"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Салгаснаас хойшхи зайны ашиглалт"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Дахин ачаалснаас хойшхи зайны ашиглалт"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> зайгаар"</string>
@@ -1932,8 +1925,7 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_used_for (4383512863007718804) -->
     <skip />
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Нийт батерейны %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтын дэлгэрэнгүй"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Барагцаалсан үлдсэн хугацаа"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Бүтэн цэнэглэх болсон"</string>
@@ -2245,8 +2237,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"Энэ функц нь зөвхөн үүрэн сүлжээтэй үед далд датанд суурилсан апп-г зогсоход хүргэж болно. \n\nТа апп доторх тохиргооноос дата ашиглалтын хяналтын илүү тохиромжтой тохируулгыг ашиглаж болно."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="1493134803720421674">"Далд датаг хязгаарлах нь зөвхөн үүрэн датаны хязгаарыг тохируулсны дараа боломжтой болно."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Өгөгдлийг автоматаар синк хийхийг асаах уу?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Таны веб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар веб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Таны веб дээрээс бүртгэлдаа оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг веб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Таны вэб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар вэб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Таны вэб дээрээс бүртгэлдаа оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг вэб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автоматаар синк хийх өгөгдлийг унтраах уу?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Энэ нь дата болон зайны цэнэг ашиглалтыг хэмнэх боловч та сүүлийн үеийн мэдээллийг цуглуулахын тулд бүртгэл бүрийг гарааг синк хийх шаардлагатай болно. Мөн шинэчлэлт хийгдсэн үед танд мэдэгдэл ирэхгүй."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ашиглалтын циклийг шинэчлэх огноо"</string>
@@ -2442,8 +2434,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Утасны дуудлага &amp; SMS-г хүлээн авах уу?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Энэ хэрэглэгчтэй утасны дуудлага болон SMS түүхийг хуваалцах болно."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Яаралтай тусламжийн мэдээлэл"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>-н мэдээлэл, харилцагч"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Апп болон агуулгыг зөвшөөрөх"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Хязгаарлалттай аппликешнүүд"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Аппликешний тохиргоог дэлгэх"</string>
@@ -2673,11 +2664,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ажлын мэдэгдлийн үндсэн ая"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Ажлын сэрүүлгийн үндсэн ая"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Хувийн профайлтай ижил"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Хувийн профайлын дууг ашиглах уу?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Солих"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Таны одоогийн ажлын профайлын дууны оронд хувийн профайлын дууг ашиглана"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Хонхны ая"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Бусад дуу, чичиргээ"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Мэдэгдлийн тохируулга"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Зөвшөөрөл олгоогүй байна"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Зөвшөөрөл шаардлаггүй"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Бүх апп-ууд"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Суулгасан апп"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Шуурхай апп"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Хувийн"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Ажил"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блоклосон"</string>
@@ -2948,7 +2935,7 @@
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Зөвшөөрөхгүй"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Дууны оролтыг сонгох"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Хөтөч апп"</string>
-    <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн веб хөтөч байхгүй"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн вэб хөтөч байхгүй"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Гар утасны апп"</string>
     <string name="default_app" msgid="6864503001385843060">"(Үндсэн)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Систем)"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хүйтэн өнгөний температур"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Өнгөний өөрчлөлтийг оруулахын тулд дэлгэцийг унтраана уу"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Утасны хяналтын өөрчлөлтийг хэрэгжүүлэхийн тулд төхөөрөмжийг дахин асаана уу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Системийн автомат шинэчлэлтүүд"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Холбосон HALs (дахин асаах шаардлагатай)"</string>
     <string name="usage" msgid="2977875522080448986">"Хэрэглээ"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Дэлхий нийтийн HTTP прокси тохиргоо"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Админ төхөөрөмжийг түгжиж, нууц үгийг сэргээх боломжтой"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Админ төхөөрөмжийн бүх өгөгдлийг устгах боломжтой"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Админ төхөөрөмжийн бүх өгөгдлийг устгахаас өмнө хамгийн ихдээ <xliff:g id="COUNT_1">%d</xliff:g> удаа нууц үг оруулах боломжтойгоор тохируулсан</item>
+      <item quantity="one">Админ төхөөрөмжийн бүх өгөгдлийг устгахаас өмнө хамгийн ихдээ <xliff:g id="COUNT_0">%d</xliff:g> удаа нууц үг оруулах боломжтойгоор тохируулсан</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Админ ажлын профайлын өгөгдлийг устгахаас өмнө хамгийн ихдээ <xliff:g id="COUNT_1">%d</xliff:g> удаа нууц үг оруулах боломжтойгоор тохируулсан</item>
+      <item quantity="one">Админ ажлын профайлын өгөгдлийг устгахаас өмнө хамгийн ихдээ <xliff:g id="COUNT_0">%d</xliff:g> удаа нууц үг оруулах боломжтойгоор тохируулсан</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Энэ төхөөрөмжийг удирдаж байна"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> удирддаг"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Дэлгэрэнгүй үзэх"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Зураг &amp; видео"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Хөгжим &amp; аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Тоглоом"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Бусад апп"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файл"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сангийн менежер: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Идэвхгүй"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Идэвхтэй"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Тоглоом"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио файл"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Хөгжим"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчээс устгасан)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчид идэвхгүй болгосон)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Автоматаар бөглөх апп"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 83b38cf..0bcf230 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास सामायिक केला जाईल."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी माहिती आणि संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंध असलेले अनुप्रयोग"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगासाठी सेटिंग्ज विस्तृत करा"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान प्रदर्शन रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मॉनिटर बदल लागू करण्‍यासाठी, डिव्‍हाइस रीबूट करा"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वयंचलित सिस्टम अद्यतने"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (रीबूट आवश्यक)"</string>
     <string name="usage" msgid="2977875522080448986">"वापर"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"जागतिक HTTP प्रॉक्‍सी सेट आहे"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"प्रशासक डिव्हाइस लॉक करु शकतो आणि संकेतशब्द रीसेट करु शकतो"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासक डिव्हाइसवरील सर्व डेटा हटवू शकतो"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">प्रशासकाने सर्व डिव्‍हाइस डेटा हटवण्‍यापूर्वी कमाल संकेतशब्द प्रयत्न <xliff:g id="COUNT_1">%d</xliff:g> वर सेट केले</item>
+      <item quantity="other">प्रशासकाने सर्व डिव्‍हाइस डेटा हटवण्‍यापूर्वी कमाल संकेतशब्द प्रयत्न <xliff:g id="COUNT_1">%d</xliff:g> वर सेट केले</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">प्रशासकाने सर्व कार्य प्रोफाइल डेटा हटवण्‍यापूर्वी कमाल संकेतशब्द प्रयत्न <xliff:g id="COUNT_1">%d</xliff:g> वर सेट केले</item>
+      <item quantity="other">प्रशासकाने सर्व कार्य प्रोफाइल डेटा हटवण्‍यापूर्वी कमाल संकेतशब्द प्रयत्न <xliff:g id="COUNT_1">%d</xliff:g> वर सेट केले</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"हे डिव्हाइस व्यवस्थापित आहे."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जाणून घ्या"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"फोटो आणि व्हिडिओ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"संगीत आणि ऑडिओ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य अॅप्स"</string>
     <string name="storage_files" msgid="8581083146777364063">"फायली"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"संचय व्यवस्थापक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडिओ फायली"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी विस्‍थापित)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"स्वयं-भरण अॅप"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0602dc9..cd9e214 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Tapis"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Buat pilihan penapis"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Semua apl"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apl yang dilumpuhkan"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Sudah dimuat turun"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Dijalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storan USB"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> yang tinggal"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> untuk mengecas"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Penggunaan skrin"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Penggunaan apl sejak cas penuh terakhir"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Penggunaan peranti sejak cas penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Kegunaan bateri sejak ditetapkan semula"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> semasa menggunakan bateri"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Digunakan untuk %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s daripada keseluruhan bateri"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Gendala penggunaan sejak pengecasan penuh terakhir"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Anggaran baki masa"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempoh hingga cas penuh"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Hidupkan panggilan telefon &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Sejarah panggilan dan SMS akan dikongsi dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Maklumat kecemasan"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Maklumat &amp; butiran hubungan untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Nada pemberitahuan kerja lalai"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Nada dering penggera kerja lalai"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama seperti profil peribadi"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Gunakan bunyi profil peribadi?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Gantikan"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Bunyi profil peribadi anda dan bukannya bunyi profil kerja semasa anda yang akan digunakan"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Nada dering"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Bunyi dan getaran lain"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Pilihan pemberitahuan"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Tiada kebenaran diberikan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Tiada kebenaran diminta"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Semua apl"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Apl yang dipasang"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Apl segera"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Peribadi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kerja"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Disekat"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk mengenakan perubahan warna, matikan skrin"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menggunakan perubahan telephony monitor, but semula peranti"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Kemas kini sistem automatik"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL Terikat (memerlukan but semula)"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proksi HTTP global ditetapkan"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Pentadbir boleh mengunci peranti dan menetapkan semula kata laluan"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Pentadbir boleh memadamkan semua data peranti"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_1">%d</xliff:g> sebelum memadamkan semua data peranti</item>
+      <item quantity="one">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_0">%d</xliff:g> sebelum memadamkan semua data peranti</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_1">%d</xliff:g> sebelum memadamkan data profil kerja</item>
+      <item quantity="one">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_0">%d</xliff:g> sebelum memadamkan data profil kerja</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Peranti ini terurus."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Peranti ini diurus oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ketahui lebih lanjut"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto &amp; Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzik &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Permainan"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Apl lain"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fail"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengurus Storan: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Mati"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Hidup"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Permainan"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fail audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(dinyahpasang untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dilumpuhkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Apl autolengkap"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index abc8a04..9a922a4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ဖုန်းခေါ်ဆိုမှုများ&amp; SMS ကို ဖွင့်မည်လား။"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ခေါ်ဆိုမှုနှင့် SMS မှတ်တမ်းကို ဤအသုံးပြုသူနှင့် မျှဝေပေးမည်။"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"အရေးပေါ်အချက်အလက်"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> အတွက် အချက်အလက်နှင့် အဆက်အသွယ်များ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"အပလီကေးရှင်းနှင့် ပါရှိချက်များကို ခွင့်ပြုရန်"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ကန့်သတ်ချက်များရှိသော အပလီကေးရှင်းများ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"အပလီကေးရှင်းဆက်တင်းများကိုချဲ့ပြပါ"</string>
@@ -2663,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"မူရင်းအလုပ်အကြောင်းကြားချက်အသံ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"မူရင်းအလုပ်သတိပေးချက် မြည်သံ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ကိုယ်ရေးကိုယ်တာပရိုဖိုင်အတိုင်းထားပါ"</string>
-    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ကိုယ်ရေးကိုယ်တာ ပရိုဖိုင်အသံများကို သုံးလိုပါသလား။"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ကိုယ်ရေး ပရိုဖိုင်အသံများကို သုံးလိုပါသလား။"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"အစားထိုးရန်"</string>
-    <string name="work_sync_dialog_message" msgid="9066322310245055242">"သင်၏ လက်ရှိ အလုပ်ပရိုဖိုင်အသံများအစား ကိုယ်ရေးကိုယ်တာ ပရိုဖိုင်အသံများကို အသုံးပြုသွားပါမည်"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"သင်၏ လက်ရှိ အလုပ်ပရိုဖိုင်အသံများအစား ကိုယ်ရေး ပရိုဖိုင်အသံများကို အသုံးပြုသွားပါမည်"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ဖုန်းမြည်သံများ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"အခြားအသံနှင့် တုန်ခါမှုများ"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"အကြောင်းကြားချက် ရွေးချယ်မှု"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"အေးသည့် အရောင်အပူချိန်"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"အရောင်ပြောင်းလဲမှု ပြုလုပ်ရန်၊ မျက်နှာပြင်ကိုပိတ်ပါ"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"တယ်လီဖုန်း ဆက်သွယ်မှုမော်နီတာကို ပြောင်းလဲမှု ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"အလိုအလျောက် စနစ်အပ်ဒိတ်များ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"ပေါင်းစည်းထားသည့် HALs (ပြန်လည် အစပြုရန် လိုအပ်ပါသည်)"</string>
     <string name="usage" msgid="2977875522080448986">"အသုံးပြုမှု"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ကမ္ဘာသုံး HTTP ပရောက်စီကို သတ်မှတ်ထားပါသည်"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"စီမံခန့်ခွဲသူသည် စက်ပစ္စည်းကို လော့ခ်ချနိုင်ပြီး စကားဝှက်ကို ပြင်ဆင်သတ်မှတ်နိုင်ပါသည်"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"စီမံခန့်ခွဲသူသည် စက်ပစ္စည်းဒေတာများအားလုံးကို ဖျက်နိုင်ပါသည်"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">စက်ပစ္စည်းဒေတာများအားလုံးကို မဖျက်မီ စကားဝှက်စမ်းသပ်ထည့်သွင်းခြင်းကို <xliff:g id="COUNT_1">%d</xliff:g> ကြိမ်အထိ ခွင့်ပြုရန် စီမံခန့်ခွဲသူက သတ်မှတ်ထားပါသည်</item>
+      <item quantity="one">စက်ပစ္စည်းဒေတာများအားလုံးကို မဖျက်မီ စကားဝှက်စမ်းသပ်ထည့်သွင်းခြင်းကို <xliff:g id="COUNT_0">%d</xliff:g> ကြိမ်အထိ ခွင့်ပြုရန် စီမံခန့်ခွဲသူက သတ်မှတ်ထားပါသည်</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">အလုပ်ပရိုဖိုင်ဒေတာများကို မဖျက်မီ စကားဝှက်စမ်းသပ်ထည့်သွင်းခြင်းကို <xliff:g id="COUNT_1">%d</xliff:g> ကြိမ်အထိ ခွင့်ပြုရန် စီမံခန့်ခွဲသူက သတ်မှတ်ထားပါသည်</item>
+      <item quantity="one">အလုပ်ပရိုဖိုင်ဒေတာများကို မဖျက်မီ စကားဝှက်စမ်းသပ်ထည့်သွင်းခြင်းကို <xliff:g id="COUNT_0">%d</xliff:g> ကြိမ်အထိ ခွင့်ပြုရန် စီမံခန့်ခွဲသူက သတ်မှတ်ထားပါသည်</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ဤစက်ပစ္စည်းကို စီမံခန့်ခွဲထားပါသည်။"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က စီမံခန့်ခွဲထားပါသည်။"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ပိုမိုလေ့လာရန်"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ဓာတ်ပုံနှင့် ဗီဒီယိုများ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"တေးဂီတနှင့် အသံ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ဂိမ်းများ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"အခြားအက်ပ်များ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ဖိုင်များ"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်− <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ပိတ်ထားသည်"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ဖွင့်ထားသည်"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ဂိမ်းများ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"အသံဖိုင်များ"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ဂီတ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ဖြုတ်ထားသည်)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ပိတ်ထားသည်)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"အလိုအလျောက် ဖြည့်စွက်ခြင်းအက်ပ်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 601164c..a1efa61 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1308,7 +1308,7 @@
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Bare enheten"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Posisjon er slått av"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Tillatelser på appnivå"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige stedsforespørsler"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige posisjonsforespørsler"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apper har bedt om posisjonen din i det siste"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Posisjonstjenester"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Høy batteribruk"</string>
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Velg filteralternativer"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alle apper"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apper som er slått av"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> gjenstår"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Batteriet er fulladet om <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Skjermbruk"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Appbruk siden sist batteriet var fulladet"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Enhetsbruk siden sist batteriet var fulladet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteribruk siden omstart"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Brukt i %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s av total batteribruk"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Oversikt over bruk siden sist batteriet var fulladet"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Anslått tid som er igjen"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tid for full opplading"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du slå på telefonsamtaler og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrops- og tekstmeldingsloggen deles med denne brukeren."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasjon for nødstilfeller"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informasjon og kontakter for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillat apper og innhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apper med begrensninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utvidelsesinnstillinger for appen"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standard varsellyd for jobb"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standard alarmlyd for jobb"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Samme som den personlige profilen"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vil du bruke lyder for den personlige profilen din?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Erstatt"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Lydene for den personlige profilen din brukes i stedet for de nåværende lydene for jobbprofilen din"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringelyder"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andre lyder og vibrasjoner"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Innstillinger for varsler"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ingen tillatelser er gitt"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ingen tillatelser er forespurt"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apper"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installerte apper"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant-apper"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Jobb"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokkert"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"For å bruke fargeendringen, slå av skjermen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start enheten på nytt for å aktivere endringene i telefonmonitoren"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemoppdateringer"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Sammensatte HAL-er (krever omstart)"</string>
     <string name="usage" msgid="2977875522080448986">"Bruk"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy-tjener er angitt"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratoren kan låse enheten og tilbakestille passordet"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratoren kan slette alle enhetsdata"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_1">%d</xliff:g> før alle enhetsdataene slettes</item>
+      <item quantity="one">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_0">%d</xliff:g> før alle enhetsdataene slettes</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_1">%d</xliff:g> før alle enhetsdataene slettes</item>
+      <item quantity="one">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_0">%d</xliff:g> før alle enhetsdataene slettes</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Denne enheten administreres."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Denne enheten administreres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Finn ut mer"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Bilder og videoklipp"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musikk og lyd"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spill"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apper"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringsadministrator: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Av"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"På"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spill"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Lydfiler"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musikk"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(avinstallert for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(slått av for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Autofyll-app"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b259665..88497bf 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ठाउँको प्रबन्ध गर्नुहोस्"</string>
     <string name="filter" msgid="2018011724373033887">"फिल्टर गर्नुहोस्"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फिल्टर विकल्पहरू छान्नुहोस्"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"सबै अनुप्रयोगहरू"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"असक्षम पारिएका अनुप्रयोगहरू"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"डाउनलोड गरियो"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"चालु"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB भण्डारण"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> बाँकी"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> चार्जमा"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"स्क्रिनले गरेको पावरको प्रयोग"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रिनले गरेको पावरको खपत"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"पछिल्लो पटक पूर्ण रूपले चार्ज भएयता अनुप्रयोगको प्रयोग"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"पछिल्लो पटक पूर्ण रूपले चार्ज भएयता यन्त्रको प्रयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग भएदेखि ब्याट्री प्रयोग"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"पुनःसेट गरेदेखि ब्याट्री प्रयोग"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ब्याट्रिमा"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s को लागि प्रयोग गरियो"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"समग्र ब्याट्रीको %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"पछिल्लो पटक पूरा चार्ज भए देखि ब्याट्रीको प्रयोग ब्रेकडाउन भयो"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"अनुमानित बाँकी समय"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"पूर्ण रूपले चार्ज हुन लाग्ने समय"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कल तथा SMS सक्षम गर्ने हो?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कल र SMS इतिहास यो प्रयोगकर्तासँग साझेदारी गरिने छ।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपतकालीन सूचना"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> का बारेमा जानकारी र सम्पर्क ठेगानाहरू"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अनुप्रयोगहरू र सामग्री अनुमति दिनुहोस्"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबन्धको साथ अनुप्रयोगहरू"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगको लागि सेटिङहरू विस्तार गर्नुहोस्"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"कार्य सम्बन्धी सूचनाको पूर्वनिर्धारित टोन"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"कार्य सम्बन्धी अलार्मको पूर्वनिर्धारित रिङटोन"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"व्यक्तिगत प्रोफाइलको जस्तै"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"व्यक्तिगत प्रोफाइका ध्वनिहरूको प्रयोग गर्ने हो?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"प्रतिस्थापन गर्नुहोस्"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"तपाईंको हालको कार्य प्रोफाइलका ध्वनिहरूको सट्टामा तपाईंको व्यक्तिगत प्रोफाइलमाका ध्वनिहरूको प्रयोग हुनेछ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"रिङटोनहरू"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ध्वनि र कम्पन सम्बन्धी अन्य कुराहरू"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"सूचना सम्बन्धी प्राथमिकताहरू"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कुनै अनुमतिहरू प्रदान गरिएको छैन"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"कुनै अनुमतिहरू अनुरोध गरिएको छैन"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सबै अनुप्रयोगहरू"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"स्थापना गरिएका अनुप्रयोगहरू"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"तात्कालिक अनुप्रयोगहरू"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"रोकियो"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"सुन्दर रंगको तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंगको परिवर्तन लागू गर्न स्क्रिन बन्द गर्नुहोस्"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मनिटरमा गरिएको परिवर्तनलाई लागू गर्न यन्त्रलाई पुनःबुट गर्नुहोस्"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित प्रणाली अद्यावधिकहरू"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (पुन: बुट गर्नु आवश्यक छ)"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
@@ -3397,14 +3383,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"विश्वव्यापी HTTP प्रोक्सी सेट गरियो"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"प्रशासकले यन्त्र लक गर्न तथा पासवर्ड रिसेट गर्न सक्नुहुनेछ"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासकले यन्त्रका सबै डेटा मेट्न सक्नुहुन्छ"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">प्रशासकले यन्त्रको सम्पूर्ण डेटा मेट्नुभन्दा पहिले पासवर्ड प्रविष्ट गर्ने अधिकतम प्रयासहरूको संख्यालाई <xliff:g id="COUNT_1">%d</xliff:g> पटकमा सेट गर्नुभएको छ</item>
+      <item quantity="one">प्रशासकले यन्त्रको सम्पूर्ण डेटा मेट्नुभन्दा पहिले पासवर्ड प्रविष्ट गर्ने अधिकतम प्रयासहरूको संख्यालाई <xliff:g id="COUNT_0">%d</xliff:g> पटकमा सेट गर्नुभएको छ</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">प्रशासकले कार्य प्रोफाइलको डेटा मेट्नुभन्दा पहिले पासवर्ड प्रविष्ट गर्ने अधिकतम प्रयासहरूको संख्या <xliff:g id="COUNT_1">%d</xliff:g> पटकमा सेट गर्नुभएको छ</item>
+      <item quantity="one">प्रशासकले कार्य प्रोफाइलको डेटा मेट्नुभन्दा पहिले पासवर्ड प्रविष्ट गर्ने अधिकतम प्रयासहरूको संख्या <xliff:g id="COUNT_0">%d</xliff:g> पटकमा सेट गर्नुभएको छ</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"यो यन्त्र यसको मालिकले व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"यो यन्त्र <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"थप जान्नुहोस्"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"तस्बिर र भिडियोहरू"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"संगीत र अडियो"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"खेलहरू"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य अनुप्रयोगहरू"</string>
     <string name="storage_files" msgid="8581083146777364063">"फाइलहरू"</string>
@@ -3415,9 +3409,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"भण्डारणको प्रबन्धक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"निष्क्रिय"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"सक्रिय"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"खेलहरू"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"अडियो फाइलहरू"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि स्थापना रद्द गरियो)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"स्वत: भरण अनुप्रयोग"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 00a6c44..9954a8c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefoonoproepen en sms inschakelen?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De oproep- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informatie bij nood"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informatie en contacten voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps en content toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Schakel het scherm uit om de kleurwijziging toe te passen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start het apparaat opnieuw op om de wijziging in Telephony Monitor toe te passen"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische systeemupdates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL\'s (vereist opnieuw opstarten)"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Algemene HTTP-proxy ingesteld"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Beheerder kan apparaat vergrendelen en wachtwoord resetten"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Beheerder kan alle apparaatgegevens verwijderen"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_1">%d</xliff:g> voordat alle apparaatgegevens worden gewist</item>
+      <item quantity="one">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_0">%d</xliff:g> voordat alle apparaatgegevens worden gewist</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_1">%d</xliff:g> voordat de gegevens van het werkprofiel worden gewist</item>
+      <item quantity="one">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_0">%d</xliff:g> voordat de gegevens van het werkprofiel worden gewist</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Dit apparaat wordt beheerd."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Dit apparaat wordt beheerd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Meer informatie"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto\'s en video\'s"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muziek en audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andere apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Bestanden"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Opslagbeheer: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Uit"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aan"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiobestanden"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muziek"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(verwijderd voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(uitgezet voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App voor automatisch aanvullen"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index b15d93a..f147a81 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ਸਪੇਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="filter" msgid="2018011724373033887">"ਫਿਲਟਰ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਚੋਣਾਂ ਚੁਣੋ"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ਡਾਊਨਲੋਡ ਕੀਤਾ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ਦੌੜ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ਸਟੋਰੇਜ"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ਬਾਕੀ"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ਚਾਰਜ ਕਰਨ ਲਈ <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"ਸਕ੍ਰੀਨ ਵਰਤੋਂ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ਸਕ੍ਰੀਨ ਖਪਤ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ਬੈਟਰੀ ਤੇ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ਲਈ ਵਰਤੀ ਗਈ"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"ਸਮੁੱਚੀ ਬੈਟਰੀ ਵਿੱਚੋਂ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਦੇ ਵੇਰਵੇ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"ਅਨੁਮਾਨਿਤ ਬਾਕੀ ਸਮਾਂ"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"ਪੂਰਾ ਚਾਰਜ ਹੋਣ ਵਿੱਚ ਬਾਕੀ ਸਮਾਂ"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ਕਾਲ ਅਤੇ SMS ਇਤਿਹਾਸ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ਪ੍ਰਤਿਬੰਧਾਂ ਵਾਲੇ ਐਪਲੀਕੇਸ਼ਨ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਸੈਟਿੰਗਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਕਾਰਜ ਸੂਚਨਾ ਟੋਨ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਕਾਰਜ ਅਲਾਰਮ ਰਿੰਗਟੋਨ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ਉਹੀ ਜੋ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਲਈ ਹੈ"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੀ ਵਰਤੋਂ ਕਰੀਏ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ਬਦਲੋ"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ਤੁਹਾਡੀਆਂ ਵਰਤਮਾਨ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੀ ਬਜਾਏ ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਜਾਵੇਗੀ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ਰਿੰਗਟੋਨਾਂ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ਹੋਰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ਸੂਚਨਾ ਤਰਜੀਹਾਂ"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ਕੋਈ ਅਨੁਮਤੀਆਂ ਨਹੀਂ ਦਿੱਤੀਆਂ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ਕਿਸੇ ਅਨੁਮਤੀਆਂ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ਸਥਾਪਤ ਐਪਾਂ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ਤਤਕਾਲ ਐਪਾਂ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ਨਿੱਜੀ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ਦਫ਼ਤਰ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ਬਲੌਕ ਕੀਤੀਆਂ"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ਠੰਡਾ ਰੰਗ ਤਾਪਮਾਨ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ਰੰਗ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ਟੈਲੀਫ਼ੋਨੀ ਮੋਨੀਟਰ ਤਬਦੀਲੀ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ਸਵੈਚਾਲਿਤ ਸਿਸਟਮ ਅੱਪਡੇਟਾਂ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ਰੀਬੂਟ ਦੀ ਲੋੜ ਹੈ)"</string>
     <string name="usage" msgid="2977875522080448986">"ਵਰਤੋਂ"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ਗਲੋਬਲ HTTP ਪ੍ਰੌਕਸੀ ਸੈੱਟ ਕੀਤੀ ਗਈ"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਨੂੰ ਲੌਕ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਸਕਦਾ ਹੈ"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">ਸਾਰਾ ਡੀਵਾਈਸ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਅਧਿਕਤਮ ਗਿਣਤੀ ਨੂੰ ਪ੍ਰਸ਼ਾਸਕ ਨੇ <xliff:g id="COUNT_1">%d</xliff:g> \'ਤੇ ਸੈੱਟ ਕੀਤਾ</item>
+      <item quantity="other">ਸਾਰਾ ਡੀਵਾਈਸ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਅਧਿਕਤਮ ਗਿਣਤੀ ਨੂੰ ਪ੍ਰਸ਼ਾਸਕ ਨੇ <xliff:g id="COUNT_1">%d</xliff:g> \'ਤੇ ਸੈੱਟ ਕੀਤਾ</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਅਧਿਕਤਮ ਗਿਣਤੀ ਨੂੰ ਪ੍ਰਸ਼ਾਸਕ ਨੇ <xliff:g id="COUNT_1">%d</xliff:g> \'ਤੇ ਸੈੱਟ ਕੀਤਾ</item>
+      <item quantity="other">ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਅਧਿਕਤਮ ਗਿਣਤੀ ਨੂੰ ਪ੍ਰਸ਼ਾਸਕ ਨੇ <xliff:g id="COUNT_1">%d</xliff:g> \'ਤੇ ਸੈੱਟ ਕੀਤਾ</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਬੰਧਨ ਅਧੀਨ ਹੈ।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ਹੋਰ ਜਾਣੋ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"ਸੰਗੀਤ ਅਤੇ ਔਡੀਓ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ਗੇਮਾਂ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ਹੋਰ ਐਪਾਂ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ਫ਼ਾਈਲਾਂ"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ਬੰਦ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ਚਾਲੂ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ਗੇਮਾਂ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ਔਡੀਓ ਫ਼ਾਈਲਾਂ"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ਸੰਗੀਤ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਣਸਥਾਪਤ ਕੀਤੀ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਯੋਗ ਬਣਾਈ)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ਆਟੋਫਿਲ ਐਪ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fc4bf9b..6fd1c7a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1509,10 +1509,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj miejscem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Wybierz opcje filtra"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Wszystkie aplikacje"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Wyłączone aplikacje"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Pobrane"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pracują"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Nośnik USB"</string>
@@ -1865,16 +1863,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Pozostało <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do naładowania"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Wykorzystanie przez ekran"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Wykorzystanie przez aplikacje od ostatniego naładowania"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Użycie baterii od zresetowania"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na baterii"</string>
@@ -1964,8 +1957,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Wykorzystane w ciągu %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s całkowitego zużycia baterii"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Zestawienie użytkowania od ostatniego pełnego naładowania"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Szacowany pozostały czas"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Czas do pełnego naładowania"</string>
@@ -2482,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Włączyć SMS-y i rozmowy telefoniczne?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historia połączeń i SMS-ów będzie dostępna dla tego użytkownika."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacje alarmowe"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacje i kontakty dla użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Zezwól na aplikacje i zawartość"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacje z ograniczeniami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozwiń ustawienia aplikacji"</string>
@@ -2715,11 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Domyślny dźwięk powiadomień w profilu do pracy"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Domyślny alarm w profilu do pracy"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Taki sam jak w profilu osobistym"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Użyć dźwięków z profilu osobistego?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zastąp"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zamiast dźwięków z Twojego profilu do pracy zostaną użyte dźwięki z profilu osobistego"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Dzwonki"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Inne dźwięki i wibracje"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Ustawienia powiadomień"</string>
@@ -2967,10 +2956,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Brak przyznanych uprawnień"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Brak próśb o przyznanie uprawnień"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Wszystkie aplikacje"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Zainstalowane aplikacje"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacje błyskawiczne"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zablokowane"</string>
@@ -3215,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Aby zastosować zmianę kolorów, wyłącz ekran"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Aby zmiana ustawienia monitorowania telefonii zaczęła obowiązywać, zrestartuj urządzenie"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Połączone warstwy HAL (wymaga zrestartowania)"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
@@ -3477,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ustawiono globalny serwer proxy HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator może zablokować urządzenie i zresetować hasło"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator może usunąć wszystkie dane z urządzenia"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+      <item quantity="many">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+      <item quantity="other">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+      <item quantity="one">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_0">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+      <item quantity="many">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+      <item quantity="other">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+      <item quantity="one">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_0">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"To urządzenie jest zarządzane."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Tym urządzeniem zarządza <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">"  "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Więcej informacji"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Zdjęcia i filmy"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzyka i nagrania audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Gry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Inne aplikacje"</string>
     <string name="storage_files" msgid="8581083146777364063">"Pliki"</string>
@@ -3495,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menedżer miejsca: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Wył."</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Wł."</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Gry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Pliki audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzyka"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> – odinstalowano)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> – wyłączono)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacja do autouzupełniania"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index c301a0f..3cfd0ee 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informações e contatos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (reinicialização necessária)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e redefinir a senha"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode excluir todos os dados do dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo é gerenciado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saber mais"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e áudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desativado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Arquivos de áudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App de preenchimento automático"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 95c2df1..5f28f34 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será partilhado com este utilizador."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informações e contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicações e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicações com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir defin. da aplicação"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar uma alteração de cor, desligue o ecrã"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar a alteração ao Monitor de telefonia, reinicie o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações do sistema automáticas"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HALs aglutinantes (requer o reinício)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global definido"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e repor a palavra-passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os dados do dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_1">%d</xliff:g> antes da eliminação de todos os dados do dispositivo</item>
+      <item quantity="one">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_0">%d</xliff:g> antes da eliminação de todos os dados do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_1">%d</xliff:g> antes da eliminação de todos os dados do perfil de trabalho</item>
+      <item quantity="one">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_0">%d</xliff:g> antes da eliminação de todos os dados do perfil de trabalho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo é gerido."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saiba mais"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e áudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicações"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desativado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de áudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalar para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativ. para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicação de preenchimento automático"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c301a0f..3cfd0ee 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informações e contatos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (reinicialização necessária)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e redefinir a senha"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode excluir todos os dados do dispositivo"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo é gerenciado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saber mais"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e áudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desativado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Arquivos de áudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App de preenchimento automático"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cf1d6f1..33a4699 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2453,8 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activați apelurile telefonice și SMS-urile?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Acest utilizator va avea acces la istoricul apelurilor și al SMS-urilor."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informații în caz de urgență"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informații și agendă pentru <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</string>
@@ -3172,8 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pentru a aplica modificarea culorilor, dezactivați ecranul"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pentru a aplica modificarea pentru Telephony Monitor, reporniți dispozitivul"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizări automate de sistem"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Module HAL conectate (este necesară repornirea)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizare"</string>
@@ -3424,14 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy global HTTP setat"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratorul poate să blocheze dispozitivul și să reseteze parola"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratorul poate să șteargă toate datele dispozitivului"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge toate datele de pe dispozitiv</item>
+      <item quantity="other">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge toate datele de pe dispozitiv</item>
+      <item quantity="one">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_0">%d</xliff:g> înainte de a șterge toate datele de pe dispozitiv</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge datele din profilul de serviciu</item>
+      <item quantity="other">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge datele din profilul de serviciu</item>
+      <item quantity="one">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_0">%d</xliff:g> înainte de a șterge datele din profilul de serviciu</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Acest dispozitiv este gestionat."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Acest dispozitiv este gestionat de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Aflați mai multe"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografii și videoclipuri"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzică și audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jocuri"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Alte aplicații"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fișiere"</string>
@@ -3442,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Managerul spațiului de stocare: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Dezactivat"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activat"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jocuri"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fișiere audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzică"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(dezinstalat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dezactivat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicația pentru completare automată"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3ee85a6..ed4c06e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1509,10 +1509,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберите параметры фильтра"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Все приложения"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Отключенные приложения"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Сторонние"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Работающие"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-накопитель"</string>
@@ -1865,16 +1863,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Батарея будет разряжена через <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Батарея будет заряжена через <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Использование экрана"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Потребление энергии экраном"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Использование приложений с момента последней полной зарядки"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Использование устройства с момента последней полной зарядки"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Расход заряда батареи с момента перезагрузки"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> от батареи"</string>
@@ -1964,8 +1957,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Использовано %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s заряда батареи"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Использование батареи с момента последней полной зарядки"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Расчетное время работы без подзарядки"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Время до полной зарядки"</string>
@@ -2482,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Включить звонки и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Этот пользователь получит доступ к журналу звонков и SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Данные для экстренных случаев"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>: информация и контакты"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
@@ -2715,11 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Звук уведомлений по умолчанию"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Сигнал будильника по умолчанию"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Совпадает с настройками в личном профиле"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Использовать сигналы из личного профиля?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Да"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Вместо текущих звуковых сигналов, выбранных в рабочем профиле, будут использованы сигналы из личного профиля."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Рингтоны"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Другие звуки и вибросигналы"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Настройки оповещений"</string>
@@ -2967,10 +2956,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"У приложения нет разрешений"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Приложение не запрашивало разрешения"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Все приложения"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Установленные приложения"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Приложения с мгновенным запуском"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблокированные"</string>
@@ -3215,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодные оттенки"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Для изменения цветовых настроек нужно отключить экран"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Чтобы включить Telephony Monitor, перезагрузите устройство"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматические обновления системы"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (требуется перезагрузка)"</string>
     <string name="usage" msgid="2977875522080448986">"Передача данных"</string>
@@ -3477,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Выбран глобальный прокси-сервер HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администратор может заблокировать устройство и сбросить пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администратор может удалить все данные с устройства"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные на устройстве будут удалены</item>
+      <item quantity="few">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные на устройстве будут удалены</item>
+      <item quantity="many">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные на устройстве будут удалены</item>
+      <item quantity="other">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные на устройстве будут удалены</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные рабочего профиля будут удалены</item>
+      <item quantity="few">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные рабочего профиля будут удалены</item>
+      <item quantity="many">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные рабочего профиля будут удалены</item>
+      <item quantity="other">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные рабочего профиля будут удалены</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Это управляемое устройство."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Этим устройством управляет <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Подробнее…"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фото и видео"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игры"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Другие приложения"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
@@ -3495,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджер хранилища: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"отключен"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"включен"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игры"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлы"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(удалено у пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(отключено для пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Приложение для автозаполнения"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5578e2e..ac2e584 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"දුරකථන ඇමතුම් සහ SMS ක්‍රියාත්මක කරන්න?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"මෙම පරිශීලකයා සමඟ ඇමතුම් සහ SMS ඉතිහාසය බෙදාගන්නා ලදි."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"හදිසි අවස්ථා තොරතුරු"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> සඳහා තොරතුරු සහ සම්බන්ධතා"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"යෙදුම්වලට හා අන්තර්ගතයන්ට ඉඩ දෙන්න"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"සීමා කිරීම් සහිත යෙදුම්"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"යෙදුම සඳහා සැකසීම් දිගහරින්න"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"සිසිල් වර්ණ උෂ්ණත්වය"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"වර්ණ වෙනස් කිරීම යෙදීමට තිරය ක්‍රියාවිරහිත කරන්න"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor වෙනස්කම සක්‍රිය කිරීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ස්වයංක්‍රිය පද්ධති යාවත්කාලීන"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (නැවත පණ ගැන්වීම අවශ්‍යයි)"</string>
     <string name="usage" msgid="2977875522080448986">"භාවිතය"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ගෝලීය HTTP ප්‍රොක්සි සකසන ලදී"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"පරිපාලකට උපාංගය අගුලු දැමීමට සහ මුරපදය යළි සැකසීමට හැකිය"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"පරිපාලකට සියලු උපාංග දත්ත මැකීමට හැකිය"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">සියලුම උපාංග දත්ත මකා දැමීමට පෙර උපරිම මුරපද උත්සහ <xliff:g id="COUNT_1">%d</xliff:g>ක් වෙත පරිපාලක සකසා ඇත</item>
+      <item quantity="other">සියලුම උපාංග දත්ත මකා දැමීමට පෙර උපරිම මුරපද උත්සහ <xliff:g id="COUNT_1">%d</xliff:g>ක් වෙත පරිපාලක සකසා ඇත</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">කාර්යාල පැතිකඩ දත්ත මකා දැමීමට පෙර උපරිම මුරපද උත්සහ <xliff:g id="COUNT_1">%d</xliff:g>ක් වෙත පරිපාලක සකසා ඇත</item>
+      <item quantity="other">කාර්යාල පැතිකඩ දත්ත මකා දැමීමට පෙර උපරිම මුරපද උත්සහ <xliff:g id="COUNT_1">%d</xliff:g>ක් වෙත පරිපාලක සකසා ඇත</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"මෙම උපාංගය කළමනාකරණය කෙරේ."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"තව දැන ගන්න"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ඡායාරූප සහ වීඩියෝ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"සංගීතය සහ ශ්‍රව්‍ය"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ක්‍රීඩා"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"වෙනත් යෙදුම්"</string>
     <string name="storage_files" msgid="8581083146777364063">"ගොනු"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ගබඩා කළමනාකරු: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ක්‍රියාවිරහිතයි"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ක්‍රියාත්මකයි"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ක්‍රීඩා"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ශ්‍රව්‍ය ගොනු"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"සංගීත"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අස්ථාපනය කෙරිණි)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අබල කෙරිණි)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ස්වයං පිරවුම් යෙදුම"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c99aa6e..f3a0c48 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1509,10 +1509,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Zvoľte možnosti filtra"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Všetky aplikácie"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Zakázané aplikácie"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Stiahnuté"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spustené"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukladací priestor USB"</string>
@@ -1865,16 +1863,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Zostáva <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do nabitia"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Využitie obrazovky"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Využitie aplikácií od posledného úplného dobitia"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Využívanie zariadenia od posledného úplného dobitia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využitie batérie od obnovenia"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na batérii"</string>
@@ -1964,8 +1957,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Využívaná %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s z celkovej výdrže batérie"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Rozdelenie využitia od posledného úplného dobitia"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Odhadovaný zostávajúci čas:"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Čas do úplného nabitia"</string>
@@ -2482,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnúť telefonické hovory a správy SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S týmto používateľom sa bude zdieľať história hovorov a správ SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Núdzové informácie"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informácie a kontakty používateľa <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
@@ -2715,11 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Predv. tón prac. upozornenia"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Predvolený tón prac. budíka"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Rovnaké ako osobný profil"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Použiť zvuky osobného profilu?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Nahradiť"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Vaše aktuálne zvuky pracovného profilu budú nahradené zvukmi osobného profilu"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tóny zvonenia"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ďalšie zvuky a vibrácie"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Predvoľby upozornení"</string>
@@ -2967,10 +2956,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Neboli udelené žiadne povolenia"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Neboli požadované žiadne povolenia"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Všetky aplikácie"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Nainštalované aplikácie"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Okamžité aplikácie"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobné"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Pracovné"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokované"</string>
@@ -3215,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ak chcete použiť zmenu farby, vypnite obrazovku"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ak chcete použiť zmenu monitorovania telefonických služieb, reštartujte zariadenie"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Zväzky modulov HAL (vyžaduje reštart)"</string>
     <string name="usage" msgid="2977875522080448986">"Využitie"</string>
@@ -3477,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Bol nastavený globálny proxy server protokolu HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Správca môže uzamknúť zariadenie a obnoviť heslo"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Správca môže zo zariadenia odstrániť všetky údaje"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="many">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="many">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_0">%d</xliff:g>.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Toto zariadenie je spravované."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Toto zariadenie spravuje organizácia <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ďalšie informácie"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotky a videá"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Hudba a zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Hry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ďalšie aplikácie"</string>
     <string name="storage_files" msgid="8581083146777364063">"Súbory"</string>
@@ -3495,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správca úložiska: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Vypnutý"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Zapnutý"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Hry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvukové súbory"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Hudba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odinštalované pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(vypnuté pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikácia automatického dopĺňania"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2d6a899..6cacca6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1509,10 +1509,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izberite možnosti filtriranja"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Vse aplikacije"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Onemogočene aplikacije"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preneseno"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Se izvaja"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Pomnilnik USB"</string>
@@ -1865,16 +1863,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Preostali čas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do napolnjenosti"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Uporaba zaslona"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Poraba aplikacij od zadnje polne napolnjenosti akumulatorja"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Poraba naprave od zadnje polne napolnjenosti akumulatorja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba akumulatorja po odklopu"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uporaba akumulatorja od ponastavitve"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Čas napajanja iz akumulatorja: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1964,8 +1957,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Trajanje uporabe: %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s celotne napolnjenosti akumulatorja"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Razčlenjen prikaz porabe od zadnje polne napolnjenosti akumulatorja"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Približni preostali čas"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Preostali čas do polne napolnjenosti"</string>
@@ -2482,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vklop telefonskih klicev in sporočil SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zgodovina klicev in sporočil SMS bo dana v skupno rabo s tem uporabnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije za nujne primere"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Podatki in stiki za uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Omogočanje aplikacij in vsebine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije z omejitvami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Dodatne nastavitve za aplikacijo"</string>
@@ -2715,11 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Privzeti delovni ton obvestila"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Privzeti delovni ton alarma"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Kot v osebnem profilu"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Ali želite uporabiti zvoke iz osebnega profila?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zamenjaj"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvoki iz osebnega profila bodo uporabljeni namesto trenutnih zvokov v delovnem profilu"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvonjenja"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Drugi zvoki in vibriranja"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Nastavitve obvestil"</string>
@@ -2967,10 +2956,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ni odobrenih dovoljenj"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ni zahtevanih dovoljenj"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Vse aplikacije"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Nameščene aplikacije"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacije brez nameščanja"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
@@ -3215,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Če želite uveljaviti spremembo barv, izklopite zaslon"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Če želite uveljaviti spremembo nadziranja telefonije, znova zaženite napravo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Samodejne sistemske posodobitve"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Povezovanje HAL (zahteva ponovni zagon)"</string>
     <string name="usage" msgid="2977875522080448986">"Uporaba"</string>
@@ -3477,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni strežnik proxy za HTTP je nastavljen"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Skrbnik lahko zaklene napravo in ponastavi geslo"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Skrbnik lahko izbriše vse podatke v napravi"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="two">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="few">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="two">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="few">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ta naprava je upravljana."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"To napravo upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Več o tem"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografije in videoposnetki"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Glasba in zvok"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
@@ -3495,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj shrambe: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Izklopljeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Vklopljeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvočne datoteke"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Glasba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogočeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija s samodejnim izpolnjevanjem"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 2fb6ec8..3fbf752 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Të aktivizohen telefonatat dhe SMS-të?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historiku i telefonatave dhe SMS-ve do të ndahet me këtë përdorues."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacioni i urgjencës"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacionet dhe kontaktet për <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lejo aplikacionet dhe përmbajtjen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacionet me kufizime"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zgjeroji cilësimet për aplikacionin"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Për të zbatuar ndryshimin e monitorit të telefonisë, rindizni pajisjen"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Përditësimet automatike të sistemit"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HALs e paketizuar (kërkon rinisje)"</string>
     <string name="usage" msgid="2977875522080448986">"Përdorimi"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Përfaqësuesi global HTTP i caktuar"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratori mund ta kyçë pajisjen dhe rivendosë fjalëkalimin"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratori mund të fshijë të gjitha të dhënat e pajisjes"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_1">%d</xliff:g> para se të fshihen të gjitha të dhënat e pajisjes</item>
+      <item quantity="one">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_0">%d</xliff:g> para se të fshihen të gjitha të dhënat e pajisjes</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_1">%d</xliff:g> para se të fshihen të dhënat e profilit të punës</item>
+      <item quantity="one">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_0">%d</xliff:g> para se të fshihen të dhënat e profilit të punës</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Kjo është një pajisje e menaxhuar."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Kjo pajisje menaxhohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Mëso më shumë"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografitë dhe videot"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzikë dhe audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Lojëra"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Aplikacionet e tjera"</string>
     <string name="storage_files" msgid="8581083146777364063">"Skedarët"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menaxheri i hapësirës ruajtëse: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Joaktiv"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiv"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Lojëra"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Skedarët audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(çinstaluar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(çaktivizuar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacioni i plotësimit automatik"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index af6df86..d3c15e0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2453,8 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Укључити телефонске позиве и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историја позива и SMS-ова ће се делити са овим корисником."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информације о хитном случају"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Информације и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
@@ -3172,8 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хладна температура боје"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Да бисте применили промену боје, искључите екран"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Рестартујте уређај да бисте применили промену TelephonyMonitor-а"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аутоматска ажурирања система"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (захтева рестартовање)"</string>
     <string name="usage" msgid="2977875522080448986">"Потрошња"</string>
@@ -3424,14 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобални HTTP прокси је подешен"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администратор може да закључава уређај и ресетује лозинку"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администратор може да брише све податке са уређаја"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу сви подаци са уређаја</item>
+      <item quantity="few">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу сви подаци са уређаја</item>
+      <item quantity="other">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу сви подаци са уређаја</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу подаци профила за Work</item>
+      <item quantity="few">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу подаци профила за Work</item>
+      <item quantity="other">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу подаци профила за Work</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Овим уређајем се управља."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Овим уређајем управља <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Сазнајте више"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Слике и видео снимци"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика и аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игре"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Друге апликације"</string>
     <string name="storage_files" msgid="8581083146777364063">"Датотеке"</string>
@@ -3442,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менаџер меморијског простора: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Искључено"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Укључено"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игре"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио датотеке"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(онемогућено за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Апликација за аутоматско попуњавање"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 53416f0..402cbed 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vill du aktivera telefonsamtal och sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Samtals- och sms-historiken delas med den här användaren."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Krisinformation"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Information och kontakter för <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Stäng av skärmen om du vill tillämpa färgändringen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Starta om enheten om du vill tillämpa ändringen för Telephony Monitor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiska systemuppdateringar"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Kopplade HAL (omstart krävs)"</string>
     <string name="usage" msgid="2977875522080448986">"Användning"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy har angetts"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratören kan låsa enheten och återställa lösenordet"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratören kan radera all data på enheten"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administratören har angett att all data på enheten ska raderas när fel lösenord har angetts <xliff:g id="COUNT_1">%d</xliff:g> gånger</item>
+      <item quantity="one">Administratören har angett att all data på enheten ska raderas när fel lösenord har angetts <xliff:g id="COUNT_0">%d</xliff:g> gång</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administratören har angett att all data i jobbprofilen ska raderas när fel lösenord har angetts <xliff:g id="COUNT_1">%d</xliff:g> gånger</item>
+      <item quantity="one">Administratören har angett att all data i jobbprofilen ska raderas när fel lösenord har angetts <xliff:g id="COUNT_0">%d</xliff:g> gång</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Den här enheten hanteras."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Den här enheten hanteras av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Läs mer"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foton och videor"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik och ljud"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spel"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andra appar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringshanteraren: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Inaktiverat"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiverat"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spel"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ljudfiler"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(har avinstallerats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(har inaktiverats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App för autofyll"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d104882..2200c39 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ungependa kuwasha SMS na kupiga simu?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Rekodi ya simu zilizopigwa na SMS zilizopokelewa itashirikiwa na mtumiaji huyu."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Maelezo ya dharura"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Maelezo na anwani za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ruhusu programu na maudhui"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programu zilizo na vizuizi"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Panua mipangilio ya programu"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Zima skrini ili uweze kutekeleza ubadilishaji wa rangi"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ili kuweka mabadiliko ya kichunguzi cha shughuli za simu, washa kifaa tena"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Masasisho ya mfumo kiotomatiki"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (inahitaji kuwasha upya)"</string>
     <string name="usage" msgid="2977875522080448986">"Matumizi"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Seva mbadala ya HTTP ya jumla iwekekwa"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Msimamizi anaweza kufunga kifaa na kubadilisha nenosiri"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Msimamizi anaweza kufuta data yote ya kifaa"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Msimamizi ameweka idadi ya juu za kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_1">%d</xliff:g> kabla ya kufuta data yote ya kifaa</item>
+      <item quantity="one">Msimamizi ameweka idadi ya juu za kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_0">%d</xliff:g> kabla ya kufuta data yote ya kifaa</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Msimamizi ameweka idadi ya juu zaidi ya kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_1">%d</xliff:g> kabla ya kufuta data ya wasifu wa kazini</item>
+      <item quantity="one">Msimamizi ameweka idadi ya juu zaidi ya kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_0">%d</xliff:g> kabla ya kufuta data ya wasifu wa kazini</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Kifaa hiki kinasimamiwa."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Kifaa hiki kinasimamiwa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Pata maelezo zaidi"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Picha na Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muziki na Sauti"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Michezo"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Programu zingine"</string>
     <string name="storage_files" msgid="8581083146777364063">"Faili"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Kidhibiti Hifadhi: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kimezimwa"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Kimewashwa"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Michezo"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Faili za sauti"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muziki"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(imeondolewa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(imezimwa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Programu ya kujaza otomatiki"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 544d331..efffce9 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ஃபோன் அழைப்புகள் &amp; SMSஐ இயக்கவா?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"அழைப்பும் SMS வரலாறும் இவருடன் பகிரப்படும்."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"அவசரத் தகவல்"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>க்கான தகவலும் தொடர்புகளும்"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"பயன்பாடுகளையும் உள்ளடக்கத்தையும் அனுமதி"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"வரையறைகளுடனான பயன்பாடுகள்"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"பயன்பாட்டிற்கான அமைப்புகளை விரிவுபடுத்து"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"நீல நிற வெப்பநிலை"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"வண்ண மாற்றத்தைப் பயன்படுத்த, திரையை முடக்கவும்"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"டெலிஃபோனி மானிட்டரில் செய்த மாற்றத்தைப் பயன்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"தானியங்கு முறைமை புதுப்பிப்புகள்"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"பைண்டர் செய்யப்பட்ட HALகள் (மறுதொடக்கம் செய்ய வேண்டும்)"</string>
     <string name="usage" msgid="2977875522080448986">"பயன்பாடு"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"குளோபல் HTTP ப்ராக்ஸி அமைக்கப்பட்டுள்ளது"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"நிர்வாகியானவர் சாதனத்தைப் பூட்டலாம், கடவுச்சொல்லை மீட்டமைக்கலாம்"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"நிர்வாகியானவர் சாதனத் தரவு முழுவதையும் நீக்கலாம்"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">அதிகபட்சமாக <xliff:g id="COUNT_1">%d</xliff:g> முறை கடவுச்சொல்லை உள்ளிட முயற்சி செய்யும் வகையில் நிர்வாகி அமைத்துள்ளார். மேலும் ஒருமுறை தவறான கடவுச்சொல்லை உள்ளிட்டால் சாதனத்தின் எல்லாத் தரவும் நீக்கப்படும்</item>
+      <item quantity="one">அதிகபட்சமாக <xliff:g id="COUNT_0">%d</xliff:g> முறை கடவுச்சொல்லை உள்ளிட முயற்சி செய்யும் வகையில் நிர்வாகி அமைத்துள்ளார். மேலும் ஒருமுறை தவறான கடவுச்சொல்லை உள்ளிட்டால் சாதனத்தின் எல்லாத் தரவும் நீக்கப்படும்</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">அதிகபட்சமாக <xliff:g id="COUNT_1">%d</xliff:g> முறை கடவுச்சொல்லை உள்ளிட முயற்சி செய்யும் வகையில் நிர்வாகி அமைத்துள்ளார். மேலும் ஒருமுறை தவறான கடவுச்சொல்லை உள்ளிட்டால் பணி விவரத்தின் தரவு நீக்கப்படும்</item>
+      <item quantity="one">அதிகபட்சமாக <xliff:g id="COUNT_0">%d</xliff:g> முறை கடவுச்சொல்லை உள்ளிட முயற்சி செய்யும் வகையில் நிர்வாகி அமைத்துள்ளார். மேலும் ஒருமுறை தவறான கடவுச்சொல்லை உள்ளிட்டால் பணி விவரத்தின் தரவு நீக்கப்படும்</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"இந்தச் சாதனம் நிர்வகிக்கப்படுகிறது."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"இந்தச் சாதனத்தை நிர்வகிப்பது: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"மேலும் அறிக"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"படங்கள் &amp; வீடியோக்கள்"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"இசை &amp; ஆடியோ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"கேம்கள்"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"பிற பயன்பாடுகள்"</string>
     <string name="storage_files" msgid="8581083146777364063">"கோப்புகள்"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"சேமிப்பக நிர்வாகி: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ஆஃப்"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ஆன்"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"கேம்கள்"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ஆடியோ கோப்புகள்"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"இசை"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>க்கு நிறுவல்நீக்கப்பட்டது)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>க்கு முடக்கப்பட்டது)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"தன்னிரப்பிப் பயன்பாடு"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 4f6fa0d..4872713 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -374,7 +374,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"మీ వేలిని సెన్సార్‌పై ఉంచి, మీకు వైబ్రేషన్ అనుభూతి కలిగిన తర్వాత దాన్ని తీసివేయండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"కొనసాగించండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"మీ వేలిముద్రలోని వివిధ భాగాలన్నింటినీ జోడించడానికి మీ వేలిని కొద్దిగా అటూ ఇటూ జరపండి"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడింది!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడింది.!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"మీ పరికరం సక్రియం చేయడానికి మరియు అన్‌లాక్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకితే సరిపోతుంది."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, కొనుగోళ్లు చేయడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి కూడా మీకు అధికారం ఉంటుంది."</string>
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"నిల్వ ఖాళీని నిర్వహించు"</string>
     <string name="filter" msgid="2018011724373033887">"ఫిల్టర్ చేయి"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ఫిల్టర్ ఎంపికలను ఎంచుకోండి"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"నిలిపివేయబడిన అనువర్తనాలు"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"డౌన్‌లోడ్ చేయబడినవి"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"అమలయ్యేవి"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB నిల్వ"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ఉంది"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>లోపు ఛార్జ్ చేయాలి"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"స్క్రీన్ వినియోగం"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"చివరిసారి పూర్తి ఛార్జింగ్ తర్వాత అనువర్తన వినియోగం"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"చివరిసారి పూర్తిగా ఛార్జ్ చేసిన తర్వాత పరికర వినియోగం"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"అన్‌ప్లగ్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"రీసెట్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"బ్యాటరీలో <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,11 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s పాటు ఉపయోగించబడింది"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"మొత్తం బ్యాటరీలో %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"చివరిసారి పూర్తిగా ఛార్జింగ్ పెట్టిన తర్వాత వినియోగ గణాంకాలు"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"అంచనా వేసిన సమయం మిగిలి ఉంది"</string>
-    <string name="estimated_charging_time_left" msgid="5877141166478224765">"పూర్తిగా ఛార్జ్ చేయాల్సిన సమయం"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"పూర్తిగా ఛార్జ్ కావడానికి సమయం"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"వినియోగం ఆధారంగా అంచనాలో మార్పు జరగవచ్చు"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"అన్‌ప్లగ్ చేసినప్పటి నుండి <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> వరకు చివరిగా అన్‌ప్లగ్ చేయబడినప్పుడు"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ఫోన్ కాల్‌లు &amp; SMSను ఆన్ చేయాలా?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"కాల్ మరియు SMS చరిత్ర ఈ వినియోగదారుతో భాగస్వామ్యం చేయబడుతుంది."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"అత్యవసర సమాచారం"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> కోసం సమాచారం &amp; పరిచయాలు"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"అనువర్తనాలు మరియు కంటెంట్‌ను అనుమతించండి"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"పరిమితులు గల అనువర్తనాలు"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"అనువర్తన సెట్టిం. విస్తరింపజేయి"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"డిఫాల్ట్ కార్యాలయ నోటిఫికేషన్ టోన్"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"డిఫాల్ట్ కార్యాలయ అలారం టోన్"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"వ్యక్తిగత ప్రొఫైల్‌లో వలె ఉంచబడతాయి"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"వ్యక్తిగత ప్రొఫైల్ ధ్వనులను ఉపయోగించాలా?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"భర్తీ చేయి"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"మీ ప్రస్తుత కార్యాలయ ప్రొఫైల్ ధ్వనులకు బదులుగా మీ వ్యక్తిగత ప్రొఫైల్ ధ్వనులు ఉపయోగించబడతాయి"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"రింగ్‌టోన్‌లు"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ఇతర ధ్వనులు మరియు వైబ్రేషన్‌లు"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"నోటిఫికేషన్ ప్రాధాన్యతలు"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"అనుమతులు మంజూరు కాలేదు"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"అనుమతులను అభ్యర్థించలేదు"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని అనువర్తనాలు"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"తక్షణ అనువర్తనాలు"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"బ్లాక్ చేయబడినవి"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ప్రశాంత వర్ణము ఉష్ణోగ్రత"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"రంగు మార్పును వర్తింపజేయడానికి, స్క్రీన్‌ను ఆఫ్ చేయండి"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"టెలిఫోనీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ నవీకరణలు"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"బైండర్ చేసిన HALలు (రీబూట్ అవసరం)"</string>
     <string name="usage" msgid="2977875522080448986">"వినియోగం"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"గ్లోబల్ HTTP ప్రాక్సీ సెట్ చేయబడింది"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"నిర్వాహకులు పరికరాన్ని లాక్ చేయగలరు మరియు పాస్‌వర్డ్‌ని రీసెట్ చేయగలరు"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"పరికరంలో ఉన్న మొత్తం డేటాని నిర్వాహకులు తొలగించగలరు"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">మొత్తం పరికర డేటాని తొలగించడం కంటే ముందు గరిష్ట పాస్‌వర్డ్‌ ప్రయత్నాల సంఖ్యను <xliff:g id="COUNT_1">%d</xliff:g>కి నిర్వాహకులు సెట్ చేసారు</item>
+      <item quantity="one">మొత్తం పరికర డేటాని తొలగించడం కంటే ముందు గరిష్ట పాస్‌వర్డ్‌ ప్రయత్నాల సంఖ్యను <xliff:g id="COUNT_0">%d</xliff:g>కి నిర్వాహకులు సెట్ చేసారు</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">కార్యాలయ ప్రొఫైల్ డేటాని తొలగించడం కంటే ముందు గరిష్ట పాస్‌వర్డ్‌ ప్రయత్నాల సంఖ్యను <xliff:g id="COUNT_1">%d</xliff:g>కి నిర్వాహకులు సెట్ చేసారు</item>
+      <item quantity="one">కార్యాలయ ప్రొఫైల్ డేటాని తొలగించడం కంటే ముందు గరిష్ట పాస్‌వర్డ్‌ ప్రయత్నాల సంఖ్యను <xliff:g id="COUNT_0">%d</xliff:g>కి నిర్వాహకులు సెట్ చేసారు</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"ఈ పరికరం నిర్వహణలో ఉంది."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా నిర్వహించబడుతోంది."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"మరింత తెలుసుకోండి"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ఫోటోలు &amp; వీడియోలు"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"సంగీతం &amp; ఆడియో"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"గేమ్‌లు"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర అనువర్తనాలు"</string>
     <string name="storage_files" msgid="8581083146777364063">"ఫైల్‌లు"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"నిల్వ నిర్వాహికి: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ఆఫ్‌లో ఉంది"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ఆన్‌లో ఉంది"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"గేమ్‌లు"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ఆడియో ఫైల్‌లు"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"సంగీతం"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>కు అన్ఇన్‌స్టాల్ చేయబడింది)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>కు నిలిపివేయబడింది)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"స్వీయ పూరింపు అనువర్తనం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ff446bc..219d418 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"เลือกตัวเลือกตัวกรอง"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"แอปทั้งหมด"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"แอปที่ปิดใช้งาน"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ดาวน์โหลดแล้ว"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ที่กำลังใช้งาน"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ที่เก็บข้อมูล USB"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"เหลืออีก <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"อีก <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> จะชาร์จเต็ม"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"การใช้งานหน้าจอ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"การใช้งานหน้าจอ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"การใช้งานแอปนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"การใช้งานอุปกรณ์นับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"การใช้แบตเตอรี่ตั้งแต่ถอดปลั๊ก"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"การใช้แบตเตอรี่ตั้งแต่รีเซ็ต"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> เมื่อใช้แบตเตอรี่"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"ใช้มานาน %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ของแบตเตอรี่ทั้งหมด"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"รายละเอียดการใช้งานนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"เวลาที่เหลือโดยประมาณ"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"เวลาที่ใช้ชาร์จจนเต็ม"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"เปิดโทรศัพท์และ SMS ไหม"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ระบบจะแชร์ประวัติการโทรและ SMS กับผู้ใช้รายนี้"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ข้อมูลและรายชื่อติดต่อสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"อนุญาตแอปและเนื้อหา"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"แอปพลิเคชันที่มีข้อจำกัด"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ขยายการตั้งค่าของแอปพลิเคชัน"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"เสียงแจ้งเตือนเริ่มต้นของงาน"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"เสียงปลุกเริ่มต้นของงาน"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"เหมือนกับโปรไฟล์ส่วนตัว"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ใช้เสียงในโปรไฟล์ส่วนตัวใช่ไหม"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"แทนที่"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ระบบจะใช้เสียงในโปรไฟล์ส่วนตัวของคุณแทนเสียงในโปรไฟล์งานปัจจุบัน"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"เสียงเรียกเข้า"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"เสียงอื่นๆ และการสั่น"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ค่ากำหนดการแจ้งเตือน"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ไม่มีการมอบสิทธิ์"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ไม่มีการขอสิทธิ์"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"แอปทั้งหมด"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"แอปที่ติดตั้ง"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant Apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ส่วนตัว"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"งาน"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ถูกบล็อก"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"อุณหภูมิสีเย็น"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"หากต้องการใช้การเปลี่ยนสี ให้ปิดหน้าจอ"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลงการตรวจสอบโทรศัพท์มีผล"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"การอัปเดตระบบอัตโนมัติ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ต้องเริ่มต้นใหม่)"</string>
     <string name="usage" msgid="2977875522080448986">"การใช้งาน"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ตั้งค่าพร็อกซี HTTP ส่วนกลางแล้ว"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ผู้ดูแลระบบสามารถล็อกอุปกรณ์และรีเซ็ตรหัสผ่าน"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ผู้ดูแลระบบสามารถลบข้อมูลทั้งหมดในอุปกรณ์"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ผู้ดูแลระบบได้กำหนดจำนวนครั้งสูงสุดในการใส่รหัสผ่านไว้ที่ <xliff:g id="COUNT_1">%d</xliff:g> ครั้งก่อนลบข้อมูลทั้งหมดในอุปกรณ์</item>
+      <item quantity="one">ผู้ดูแลระบบได้กำหนดจำนวนครั้งสูงสุดในการใส่รหัสผ่านไว้ที่ <xliff:g id="COUNT_0">%d</xliff:g> ครั้งก่อนลบข้อมูลทั้งหมดในอุปกรณ์</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">ผู้ดูแลระบบได้กำหนดจำนวนครั้งสูงสุดในการใส่รหัสผ่านไว้ที่ <xliff:g id="COUNT_1">%d</xliff:g> ครั้งก่อนลบข้อมูลโปรไฟล์งาน</item>
+      <item quantity="one">ผู้ดูแลระบบได้กำหนดจำนวนครั้งสูงสุดในการใส่รหัสผ่านไว้ที่ <xliff:g id="COUNT_0">%d</xliff:g> ครั้งก่อนลบข้อมูลโปรไฟล์งาน</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"อุปกรณ์นี้มีการจัดการ"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"อุปกรณ์เครื่องนี้จัดการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"เรียนรู้เพิ่มเติม"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"รูปภาพและวิดีโอ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"เพลงและเสียง"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"เกม"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"แอปอื่นๆ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ไฟล์"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ตัวจัดการพื้นที่เก็บข้อมูล: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ปิด"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"เปิด"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"เกม"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ไฟล์เสียง"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"เพลง"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ถอนการติดตั้งแล้วสำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ปิดใช้อยู่สำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"แอปการป้อนอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 8cdee2c..32bd66f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
     <string name="filter" msgid="2018011724373033887">"I-filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pumili ng mga opsyon ng filter"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Lahat ng app"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Mga naka-disable na app"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Na-download"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Tumatakbo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Imbakan na USB"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> natitira"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> upang ma-charge"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Paggamit ng screen"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Paggamit ng app simula noong huling nakumpleto ang charge"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Paggamit ng device simula noong huling nakumpleto ang charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Paggamit ng baterya mula ng ini-reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> sa baterya"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Ginamit nang %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ng pangkalahatang baterya"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Breakdown ng paggamit simula noong huling nakumpleto ang charge"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tinatayang natitirang oras"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tagal bago mapuno ang baterya"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"I-on ang mga pagtawag sa telepono at SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ibabahagi sa user na ito ang history ng pagtawag at SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Impormasyong pang-emergency"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Impormasyon at mga contact para kay <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Payagan ang apps at nilalaman"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Mga application na may mga paghihigpit"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Palawakin ang mga setting para sa application"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Default notif. tone sa trabaho"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Default na alarm sa trabaho"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Pareho sa personal na profile"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Gamitin ang mga tunog sa personal na profile?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Palitan"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Gagamitin ang mga tunog sa iyong personal na profile sa halip na ang iyong mga kasalukuyang tunog sa profile sa trabaho"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Mga Ringtone"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Iba pang mga tunog at pag-vibrate"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Mga kagustuhan sa notification"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Walang ibinigay na mga pahintulot"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Walang hiniling na mga pahintulot"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Lahat ng app"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Mga naka-install na app"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Mga instant na app"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabaho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Na-block"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Upang ilapat ang pagbabago sa kulay, i-off ang screen"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Upang ilapat ang pagbabago sa telephony monitor, i-reboot ang device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mga awtomatikong pag-update ng system"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Mga Naka-binderize na HAL (kailangang mag-reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Paggamit"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Naitakda na ang pangkalahatang HTTP proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Maaaring i-lock ng admin ang device at i-reset ang password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Maaaring i-delete ng admin ang lahat ng data ng device"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang lahat ng data ng device</item>
+      <item quantity="other">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang lahat ng data ng device</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang data ng profile sa trabaho</item>
+      <item quantity="other">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang data ng profile sa trabaho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Pinamamahalaan ang device na ito."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Pinamamahalaan ng <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Matuto pa"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Mga Larawan at Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musika at Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Mga Laro"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Iba pang mga app"</string>
     <string name="storage_files" msgid="8581083146777364063">"Mga File"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Manger ng Storage: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Naka-off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Naka-on"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Mga Laro"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Mga audio file"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(na-uninstall para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(na-disable para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Autofill na app"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 02941fb..8338cad 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtre seçeneklerini belirleyin"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Tüm uygulamalar"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Devre dışı bırakılan uygulamalar"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"İndirilenler"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışanlar"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB bellek"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> kaldı"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Şarj olmasına <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> var"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekranın pil kullanımı"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Son tam şarjdan sonraki uygulama kullanımı"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Son yapılan tam şarjdan sonraki cihaz kullanımı"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Pilde <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s kullandı"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Toplam pilden %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Son tam şarjdan sonraki kullanım dökümü"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Kalan tahmini süre"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tamamen şarj olma süresi"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon çağrıları ve SMS açılsın mı?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Çağrı ve SMS geçmişi bu kullanıcıyla paylaşılacak."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Acil durum bilgileri"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> için bilgi ve kişiler"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Varsayılan iş bildirimi sesi"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Varsayılan iş alarmı zil sesi"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Kişisel profille aynı"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Kişisel profil sesleri kullanılsın mı?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Değiştir"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Mevcut iş profili seslerinizin yerine kişisel profil sesleriniz kullanılacak"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zil sesleri"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Diğer sesler ve titreşimler"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Bildirim tercihleri"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Hiçbir izin verilmedi"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Hiçbir izin istenmedi"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tüm uygulamalar"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Yüklü uygulamalar"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Hazır uygulamalar"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Kişisel uygulamalar"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"İş uygulamaları"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Engellenenler"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Renk değişikliğini uygulamak için ekranı kapatın"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony monitor değişikliğini uygulamak için cihazı yeniden başlatın"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Otomatik sistem güncellemeleri"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binder uygulanmış HAL\'ler (yeniden başlatma gerekir)"</string>
     <string name="usage" msgid="2977875522080448986">"Kullanım"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Genel HTTP proxy\'si ayarlanmış"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Yönetici cihazı kilitleyebilir ve şifreyi sıfırlayabilir"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Yönetici tüm cihaz verilerini silebilir"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Yönetici, tüm cihaz verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_1">%d</xliff:g> olarak ayarladı.</item>
+      <item quantity="one">Yönetici, tüm cihaz verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_0">%d</xliff:g> olarak ayarladı.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Yönetici, iş profili verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_1">%d</xliff:g> olarak ayarladı.</item>
+      <item quantity="one">Yönetici, iş profili verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_0">%d</xliff:g> olarak ayarladı.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Bu cihaz yönetilen bir cihazdır."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından yönetiliyor."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Daha fazla bilgi"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotoğraflar ve Videolar"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Müzik ve Ses"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Diğer uygulamalar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dosyalar"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Depolama Yöneticisi: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kapalı"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Açık"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Oyunlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ses dosyaları"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Müzik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> için yükleme kaldırıldı)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> için devre dışı bırakıldı)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Otomatik doldurma uygulaması"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f06c12b..d9d6c7f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2474,8 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Увімкнути телефонні дзвінки й SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Цей користувач матиме доступ до історії дзвінків і SMS"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Інформація для екстрених випадків"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Інформація та контакти користувача <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налаштув. програм"</string>
@@ -3203,8 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодна температура кольорів"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Щоб змінити кольори, вимкніть екран"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Щоб застосувати зміни у функції Telephony Monitor, перезапустіть пристрій"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматичне оновлення системи"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Зв’язані модулі HAL (потрібно перезапустити)"</string>
     <string name="usage" msgid="2977875522080448986">"Використання"</string>
@@ -3465,14 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Установлено глобальний проксі-сервер HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Адміністратор може заблокувати пристрій і скинути пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Адміністратор може видалити всі дані пристрою"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спробу введення пароля, перш ніж усі дані пристрою буде видалено</item>
+      <item quantity="few">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані пристрою буде видалено</item>
+      <item quantity="many">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроб введення пароля, перш ніж усі дані пристрою буде видалено</item>
+      <item quantity="other">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані пристрою буде видалено</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спробу введення пароля, перш ніж усі дані профілю буде видалено</item>
+      <item quantity="few">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані профілю буде видалено</item>
+      <item quantity="many">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроб введення пароля, перш ніж усі дані профілю буде видалено</item>
+      <item quantity="other">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані профілю буде видалено</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Цим пристроєм керує адміністратор."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Цим пристроєм керує <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Докладніше"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фото й відео"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика й аудіо"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Ігри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Інші додатки"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файли"</string>
@@ -3483,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Диспетчер пам’яті: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Вимкнено"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Увімкнено"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Ігри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудіофайли"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(видалено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(вимкнено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Додаток автозаповнення"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a5a9855..0811e03 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"خالی جگہ کا نظم کریں"</string>
     <string name="filter" msgid="2018011724373033887">"فلٹر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"فلٹر کے اختیارات منتخب کریں"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"سبھی ایپس"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"غیر فعال کردہ ایپس"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ڈاؤن لوڈ کردہ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"چل رہے ہیں"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏USB اسٹوریج"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> باقی"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> چارج کرنے کیلئے"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"اسکرین کا استعمال"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"اسکرین کی کھپت"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"پچھلی بار مکمل چارج کرنے کے بعد سے ایپ کا استعمال"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"پچھلی بار مکمل چارج کرنے کے بعد سے آلہ کا استعمال"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"دوبارہ ترتیب دیے جانے کے بعد سے بیٹری کا استعمال"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"بیٹری پر <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"‏%1$s کیلئے استعمال کیا گيا"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"‏مجموعی طور پر بیٹری کے استعمال کا %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"پچھلے مکمل چارج کے بعد سے استعمال کا تجزیہ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"باقی تخمینی وقت"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"مکمل چارج ہونے کیلئے وقت"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏فون کالز اور SMS آن کریں؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏کال اور SMS کی سرگزشت کا اس صارف کے ساتھ اشتراک کیا جائے گا۔"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ہنگامی معلومات"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> کے متعلق معلومات اور رابطے"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ایپس اور مواد کی اجازت دیں"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"پابندیوں والی ایپلیکیشنز"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ایپ کیلئے ترتیبات پھیلائیں"</string>
@@ -2669,11 +2660,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"دفتری اطلاع کی ڈیفالٹ ٹون"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"دفتری الارم کی ڈیفالٹ رنگ ٹون"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ذاتی پروفائل کے جیسی"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ذاتی پروفائل کی آوازیں استعمال کریں؟"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"بدلیں"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"آپ کی موجودہ دفتری پروفائل کی آوازوں کی بجائے آپ کی ذاتی پروفائل کی آوازیں استعمال کی جائیں گی"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"رنگ ٹونز"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"دیگر آوازیں اور وائبریشنز"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"اطلاع کی ترجیحات"</string>
@@ -2909,10 +2898,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"کوئی اجازت عطا نہیں کی گئی"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"کسی اجازت کی درخواست نہیں کی گئی"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"سبھی ایپس"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"انسٹال کردہ ایپس"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"فوری ایپس"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ذاتی"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"دفتری"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود"</string>
@@ -3151,8 +3138,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"سرد رنگ کا درجہ حرارت"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"رنگ میں تبدیلی لاگو کرنے کیلئے اسکرین آف کریں"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ٹیلیفونی مانیٹر کی تبدیلی لاگو کرنے کیلئے، آلہ ریبوٹ کریں"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"خودکار سسٹم اپ ڈیٹس"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏بائنڈرائز کردہ HALs (ریبوٹ درکار ہے)"</string>
     <string name="usage" msgid="2977875522080448986">"استعمال"</string>
@@ -3393,14 +3379,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏عالمی HTTP پراکسی سیٹ ہے"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ایڈمن آلہ کو مقفل اور پاس ورڈ کو دوبارہ ترتیب دے سکتا ہے"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ایڈمن آلہ کے تمام ڈیٹا کو حذف کرسکتا ہے"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other"> منتظم نے آلہ کے تمام ڈیٹا کو حذف کرنے سے قبل پاس ورڈ درج کرنے کی زیادہ سے زیادہ کوششوں کی تعداد کو <xliff:g id="COUNT_1">%d</xliff:g> پر سیٹ کیا ہے</item>
+      <item quantity="one"> منتظم نے آلہ کے تمام ڈیٹا کو حذف کرنے سے قبل پاس ورڈ درج کرنے کی زیادہ سے زیادہ کوششوں کی تعداد کو <xliff:g id="COUNT_0">%d</xliff:g> پر سیٹ کیا ہے</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other"> منتظم نے دفتری پروفائل ڈیٹا کو حذف کرنے سے قبل پاس ورڈ درج کرنے کی زیادہ سے زیادہ کوششوں کی تعداد کو <xliff:g id="COUNT_1">%d</xliff:g> پر سیٹ کیا ہے</item>
+      <item quantity="one"> منتظم نے دفتری پروفائل ڈیٹا کو حذف کرنے سے قبل پاس ورڈ درج کرنے کی زیادہ سے زیادہ کوششوں کی تعداد کو <xliff:g id="COUNT_0">%d</xliff:g> پر سیٹ کیا ہے</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"یہ آلہ زیر انتظام ہے۔"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> کے زیر انتظام ہے۔"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"مزید جانیں"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"تصاویر اور ویڈیوز"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"موسیقی اور آڈیو"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"گیمز"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"دیگر ایپس"</string>
     <string name="storage_files" msgid="8581083146777364063">"فائلز"</string>
@@ -3411,9 +3405,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"اسٹوریج مینیجر: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"آف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"آن"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"گیمز"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"آڈیو فائلز"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"موسیقی"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(صارف کیلیے اَن انسٹال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(صارف کے لیے غیر فعال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"آٹو فل ایپ"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f38685f..a681928 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2432,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon qo‘ng‘iroqlari va SMS yoqilsinmi?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Qo‘ng‘iroq va SMS xabarlar tarixi ushbu foydalanuvchiga ham ko‘rinadi."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Favqulodda vaziyatlar uchun axborot"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> uchun ma’lumot va kontaktlar"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ilovalar va kontentga ruxsat berish"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Cheklovlar o‘rnatilgan ilovalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ilovalar uchun sozlamalarni kengaytirish"</string>
@@ -3141,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rangni o‘zgartirish uchun ekranni o‘chiring"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik tizim yangilanishlari"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (o‘chirib yoqish shart)"</string>
     <string name="usage" msgid="2977875522080448986">"Trafik sarfi"</string>
@@ -3383,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proksi-serveri sozlandi"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator qurilmani qulflashi va parolni o‘zgartirishi mumkin"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator barcha qurilma ma’lumotlarini o‘chirib tashlashi mumkin"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administrator <xliff:g id="COUNT_1">%d</xliff:g> marta parol xato terilganda qurilmadagi barcha ma’lumotlar o‘chib ketadigan qilib sozlagan</item>
+      <item quantity="one">Administrator <xliff:g id="COUNT_0">%d</xliff:g> marta parol xato terilganda qurilmadagi barcha ma’lumotlar o‘chib ketadigan qilib sozlagan</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administrator <xliff:g id="COUNT_1">%d</xliff:g> marta parol xato terilganda ishchi profil ma’lumotlari o‘chib ketadigan qilib sozlagan</item>
+      <item quantity="one">Administrator <xliff:g id="COUNT_0">%d</xliff:g> marta parol xato terilganda ishchi profil ma’lumotlari o‘chib ketadigan qilib sozlagan</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Bu – boshqariladigan qurilma."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu – <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan boshqariladigan qurilma."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Batafsil"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Surat va videolar"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiqa va audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"O‘yinlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Boshqa ilovalar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
@@ -3401,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xotira menejeri: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"O‘chiq"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Yoniq"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"O‘yinlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fayllar"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiqa"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirilgan)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirib qo‘yilgan)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Avtomatik to‘ldirish uchun ilova"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c52011d..3daed96 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
     <string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Chọn tùy chọn bộ lọc"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"Tất cả ứng dụng"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Ứng dụng bị tắt"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Đã tải xuống"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Đang hoạt động"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Bộ nhớ USB"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> còn lại"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> để tính phí"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"Mức sử dụng của màn hình"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Mức sử dụng ứng dụng kể từ lần sạc đầy pin sau cùng"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Mức sử dụng thiết bị kể từ lần sạc đầy pin sau cùng"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sử dụng pin từ khi đặt lại"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> trong thời lượng pin"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Đã sử dụng trong %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s trong tổng số pin"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Chi tiết sử dụng từ lần sạc đầy cuối cùng"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Thời gian còn lại ước tính"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"Thời gian để sạc đầy"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Bạn muốn bật cuộc gọi điện thoại và SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Nhật ký cuộc gọi và tin nhắn SMS sẽ được chia sẻ với người dùng này."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Thông tin khẩn cấp"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Thông tin &amp; liên hệ cho <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Cho phép ứng dụng và nội dung"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Ứng dụng có hạn chế"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Mở rộng cài đặt cho ứng dụng"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Chuông báo công việc mặc định"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Chuông báo công việc mặc định"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Giống như hồ sơ cá nhân"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Sử dụng âm thanh hồ sơ cá nhân?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Thay thế"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Âm thanh hồ sơ cá nhân của bạn sẽ được sử dụng thay vì âm thanh hồ sơ công việc hiện tại của bạn"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Nhạc chuông"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Âm thanh khác và rung"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Tùy chọn thông báo"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Chưa được cấp quyền nào"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Không yêu cầu quyền"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tất cả ứng dụng"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Ứng dụng đã cài đặt"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ứng dụng tức thì"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Cá nhân"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Cơ quan"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Đã chặn"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Để áp dụng thay đổi màu, hãy tắt màn hình"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Để áp dụng thay đổi với giám sát điện thoại, hãy khởi động lại thiết bị"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Cập nhật hệ thống tự động"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL được liên kết (yêu cầu khởi động lại)"</string>
     <string name="usage" msgid="2977875522080448986">"Sử dụng"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Đặt proxy HTTP chung"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Quản trị viên có thể khóa thiết bị và đặt lại mật khẩu"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Quản trị viên có thể xóa tất cả dữ liệu thiết bị"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_1">%d</xliff:g> trước khi xóa tất cả dữ liệu trên thiết bị</item>
+      <item quantity="one">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_0">%d</xliff:g> trước khi xóa tất cả dữ liệu trên thiết bị</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_1">%d</xliff:g> trước khi xóa dữ liệu hồ sơ công việc</item>
+      <item quantity="one">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_0">%d</xliff:g> trước khi xóa dữ liệu hồ sơ công việc</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Thiết bị này được quản lý."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Thiết bị này được <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> quản lý."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Tìm hiểu thêm"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Ảnh và video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Nhạc và âm thanh"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Trò chơi"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ứng dụng khác"</string>
     <string name="storage_files" msgid="8581083146777364063">"Tệp"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Trình quản lý bộ nhớ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Tắt"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Bật"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Trò chơi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Tệp âm thanh"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Nhạc"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(gỡ cài đặt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(đã tắt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Ứng dụng tự động điền"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8879b22..d57906e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"选择过滤选项"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"所有应用"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"已停用的应用"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB存储设备"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"电池剩余使用时间：<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"充电剩余时间：<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"屏幕开启时间"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"屏幕耗电量"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"自上次充满电后的应用用电量"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"自上次充满电后的设备用电量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重置后的电量消耗情况"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"电池已用时间：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"已使用 %1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"耗用整体电量的 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"自上次充满电后的详细用量信息"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"预计剩余时间"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"距离充满电的时间"</string>
@@ -2023,7 +2015,7 @@
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"一半"</string>
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"关闭"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
-    <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"凭据存储空间"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"从SD卡安装"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"从存储设备安装证书"</string>
@@ -2440,8 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"要开启通话和短信功能吗？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"将与此用户共享通话记录和短信记录。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"急救信息"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相关信息和联系方式"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
@@ -2671,11 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"默认工作通知铃声"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"默认工作闹钟铃声"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"与个人资料相同"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"要使用个人资料提示音吗？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"替换"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"系统将使用您的个人资料提示音，而不是您当前的工作资料提示音"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"铃声"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"其他提示音和振动"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知偏好设置"</string>
@@ -2911,10 +2900,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"未授予任何权限"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"未请求任何权限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有应用"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"已安装的应用"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"免安装应用"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已屏蔽"</string>
@@ -3153,8 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色温"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"要应用颜色更改，请关闭屏幕"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"要应用电话监控器的变更内容，请重新启动设备"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自动系统更新"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"绑定式 HAL（需要重新启动）"</string>
     <string name="usage" msgid="2977875522080448986">"流量消耗"</string>
@@ -3395,14 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已设置全局 HTTP 代理"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理员可以锁定设备和重置密码"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理员可以删除所有设备数据"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">管理员已将密码尝试次数上限设为 <xliff:g id="COUNT_1">%d</xliff:g> 次（超过此上限将删除所有设备数据）</item>
+      <item quantity="one">管理员已将密码尝试次数上限设为 <xliff:g id="COUNT_0">%d</xliff:g> 次（超过此上限将删除所有设备数据）</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">管理员已将密码尝试次数上限设为 <xliff:g id="COUNT_1">%d</xliff:g> 次（超过此上限将删除工作资料数据）</item>
+      <item quantity="one">管理员已将密码尝试次数上限设为 <xliff:g id="COUNT_0">%d</xliff:g> 次（超过此上限将删除工作资料数据）</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"此设备为受管理设备。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"此设备由“<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>”管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"了解详情"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"照片和视频"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音乐和音频"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"游戏"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他应用"</string>
     <string name="storage_files" msgid="8581083146777364063">"文件"</string>
@@ -3413,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"存储空间管理器：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"关闭"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"开启"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"游戏"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音频文件"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音乐"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"（已为用户<xliff:g id="USER">%s</xliff:g>卸载）"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（已为用户<xliff:g id="USER">%s</xliff:g>停用）"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自动填充应用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 30375df..6f79f99 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1488,10 +1488,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選選項"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"所有應用程式"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"已停用的應用程式"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
@@ -1832,16 +1830,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"剩餘 <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>後完成充電"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"螢幕使用情況"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"上次完全充電後的應用程式使用情況"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"上次完全充電後的裝置使用情況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池電力剩餘時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1931,8 +1924,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"已使用時間：%1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"整體電量的 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"上次完全充電後的使用情況分析"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"估計剩餘時間"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"完全充電的剩餘所需時間"</string>
@@ -2443,8 +2435,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟手機通話和短訊？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話和短訊記錄都會與這位使用者分享。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資料"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊和聯絡資料"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受到限制的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2674,11 +2665,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"預設工作通知音"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"預設工作鬧鐘鈴聲"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"與個人設定檔相同"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"要使用個人設定檔音效嗎？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"取代"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"系統將不再使用目前的工作設定檔音效，並改為使用個人設定檔音效"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"其他音效和震動"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知偏好設定"</string>
@@ -2914,10 +2903,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"沒有授予權限"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"沒有要求權限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"即時應用程式"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
@@ -3156,8 +3143,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器顏色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更，請先關閉螢幕"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"如要套用「電話監控工具」的變更內容，請重新啟動裝置"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (需要重新啟動)"</string>
     <string name="usage" msgid="2977875522080448986">"用量"</string>
@@ -3398,14 +3384,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理員可以鎖定裝置和重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理員可以刪除所有裝置資料"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">管理員已將輸入密碼的次數上限設為 <xliff:g id="COUNT_1">%d</xliff:g> 次。如果超出此上限，系統將刪除所有裝置資料</item>
+      <item quantity="one">管理員已將輸入密碼的次數上限設為 <xliff:g id="COUNT_0">%d</xliff:g> 次。如果超出此上限，系統將刪除所有裝置資料</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">管理員已將輸入密碼的次數上限設為 <xliff:g id="COUNT_1">%d</xliff:g> 次。如果超出此上限，系統將刪除工作設定檔資料</item>
+      <item quantity="one">管理員已將輸入密碼的次數上限設為 <xliff:g id="COUNT_0">%d</xliff:g> 次。如果超出此上限，系統將刪除工作設定檔資料</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"此裝置已受管理。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"瞭解詳情"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"相片和影片"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音樂和音訊"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
     <string name="storage_files" msgid="8581083146777364063">"檔案"</string>
@@ -3416,9 +3410,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音樂"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 停用)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自動填入應用程式"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 10cc853..63dbfdc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1487,10 +1487,8 @@
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選器選項"</string>
-    <!-- no translation found for filter_apps_all (8899612398848280352) -->
-    <skip />
-    <!-- no translation found for filter_apps_disabled (5862632369555319938) -->
-    <skip />
+    <string name="filter_apps_all" msgid="8899612398848280352">"所有應用程式"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"已停用的應用程式"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
@@ -1831,16 +1829,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"還剩 <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>後充電完畢"</string>
-    <!-- no translation found for device_screen_usage (224482533839040430) -->
-    <skip />
-    <!-- no translation found for device_screen_consumption (4607589286438986687) -->
-    <skip />
-    <!-- no translation found for device_cellular_network (4724773411762382950) -->
-    <skip />
-    <!-- no translation found for power_usage_list_summary (792703666229965848) -->
-    <skip />
-    <!-- no translation found for device_usage_list_summary (1545514224536252111) -->
-    <skip />
+    <string name="device_screen_usage" msgid="224482533839040430">"螢幕用量"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"上次充飽後的應用程式用量"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"上次充飽後的裝置用量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池已使用時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1930,8 +1923,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"使用時間：%1$s"</string>
-    <!-- no translation found for battery_overall_usage (5541736421708733643) -->
-    <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"佔整體電量的 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"上次充飽後的詳細用量資訊"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"預估剩餘時間"</string>
     <string name="estimated_charging_time_left" msgid="5877141166478224765">"電池充飽的剩餘所需時間"</string>
@@ -2444,8 +2436,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟通話和簡訊功能？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話和簡訊紀錄將與這位使用者共用。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資訊"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊和聯絡資料"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2675,11 +2666,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"預設 Work 通知音效"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"預設 Work 鬧鐘鈴聲"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"與個人設定檔相同"</string>
-    <!-- no translation found for work_sync_dialog_title (3351285490304048243) -->
-    <skip />
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"要使用個人設定檔音效嗎？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"取代"</string>
-    <!-- no translation found for work_sync_dialog_message (9066322310245055242) -->
-    <skip />
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"系統將使用你的個人設定檔音效，而非目前的 Work 設定檔音效"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"其他音效與震動"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知偏好設定"</string>
@@ -2915,10 +2904,8 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"未取得任何授權"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"未要求任何權限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
-    <!-- no translation found for filter_enabled_apps (5395727306799456250) -->
-    <skip />
-    <!-- no translation found for filter_instant_apps (574277769963965565) -->
-    <skip />
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"免安裝應用程式"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"公司"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
@@ -3157,8 +3144,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更設定，請關閉螢幕"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"如要套用 Telephony Monitor 的變更內容，請重新啟動裝置"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (需要重新啟動)"</string>
     <string name="usage" msgid="2977875522080448986">"使用情況"</string>
@@ -3399,14 +3385,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理員可以鎖定裝置及重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理員可以刪除所有裝置資料"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_1">%d</xliff:g> 次，否則就會自動刪除所有裝置資料</item>
+      <item quantity="one">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_0">%d</xliff:g> 次，否則就會自動刪除所有裝置資料</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_1">%d</xliff:g> 次，否則就會自動刪除 Work 設定檔資料</item>
+      <item quantity="one">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_0">%d</xliff:g> 次，否則就會自動刪除 Work 設定檔資料</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"這是受機構管理的裝置。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"這個裝置是由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 所管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"瞭解詳情"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"相片和影片"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音樂和音訊"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
     <string name="storage_files" msgid="8581083146777364063">"檔案"</string>
@@ -3417,9 +3411,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音樂"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(已為使用者<xliff:g id="USER">%s</xliff:g>解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自動填入應用程式"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b3c0965..d48d764 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2433,8 +2433,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vula amakholi wefoni ne-SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Umlando wekholi ne-SMS uzokwabiwa nalo msebenzisi."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Ulwazi lwesimo esiphuthumayo"</string>
-    <!-- no translation found for emergency_info_summary (5062945162967838521) -->
-    <skip />
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Ulwazi noxhumana nabo baka-<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
@@ -3142,8 +3141,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ukuze usebenzise ukushintshwa kombala, vala isikrini"</string>
-    <!-- no translation found for telephony_monitor_toast (7003764250271195384) -->
-    <skip />
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Izibuyekezo zesistimu ezenzakalelayo"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"I-Binderized HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Ukusetshenziswa"</string>
@@ -3384,14 +3382,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ummeleli we-Global HTTP usethiwe"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Umlawuli angakhiya idivayisi aphinde asethe kabusha iphasiwedi"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Umlawuli angasusa yonke idatha yedivayisi"</string>
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_device (7687271729962516228) -->
-    <!-- no translation found for enterprise_privacy_failed_password_wipe_work (4192488502181650982) -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Umlawuli usethe imizamo eminingi yephasiwedi yaba ngu-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa yonke idatha yedivayisi</item>
+      <item quantity="other">Umlawuli usethe imizamo eminingi yephasiwedi yaba ngu-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa yonke idatha yedivayisi</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Umqondisi usethe imizamo eminingi yephasiwedi yaya ku-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa idatha yephrofayela yomsebenzi</item>
+      <item quantity="other">Umqondisi usethe imizamo eminingi yephasiwedi yaya ku-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa idatha yephrofayela yomsebenzi</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Le divayisi iphethwe."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Le divayisi iphethwe yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Funda kabanzi"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Izithombe namavidiyo"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Umculo nomsindo"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Amageyimu"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ezinye izinhlelo zokusebenza"</string>
     <string name="storage_files" msgid="8581083146777364063">"Amafayela"</string>
@@ -3402,9 +3408,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Umphathi wesitolo: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kuvaliwe"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Vuliwe"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Amageyimu"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Amafayela omsindo"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Umculo"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(kukhishelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(kukhutshazelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Ukugcwalisa okuzenzakalelayo kohlelo lokusebenza"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 0fa2b71..f81bf9b 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -67,4 +67,36 @@
     <!-- If the support features are enabled. -->
     <bool name="config_support_enabled">false</bool>
 
+    <!-- List containing the component names of pre-installed screen reader services. -->
+    <string-array name="config_preinstalled_screen_reader_services" translatable="false">
+        <!--
+        <item>com.example.package.first/com.example.class.FirstService</item>
+        <item>com.example.package.second/com.example.class.SecondService</item>
+        -->
+    </string-array>
+
+    <!-- List containing the component names of pre-installed audio and captioning services. -->
+    <string-array name="config_preinstalled_audio_and_caption_services" translatable="false">
+        <!--
+        <item>com.example.package.first/com.example.class.FirstService</item>
+        <item>com.example.package.second/com.example.class.SecondService</item>
+        -->
+    </string-array>
+
+    <!-- List containing the component names of pre-installed display services. -->
+    <string-array name="config_preinstalled_display_services" translatable="false">
+        <!--
+        <item>com.example.package.first/com.example.class.FirstService</item>
+        <item>com.example.package.second/com.example.class.SecondService</item>
+        -->
+    </string-array>
+
+    <!-- List containing the component names of pre-installed interaction control services. -->
+    <string-array name="config_preinstalled_interaction_control_services" translatable="false">
+        <!--
+        <item>com.example.package.first/com.example.class.FirstService</item>
+        <item>com.example.package.second/com.example.class.SecondService</item>
+        -->
+    </string-array>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4df5526..4af9cc8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3013,6 +3013,10 @@
     <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%1$s</xliff:g> instead of <xliff:g id="current_app">%2$s</xliff:g> as your SMS app?</string>
     <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
 
+    <!-- Network Scorer Picker title [CHAR LIMIT=40]-->
+    <string name="network_scorer_picker_title">Network Scorer</string>
+    <string name="network_scorer_picker_none_preference">None</string>
+
     <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
     <string name="network_scorer_change_active_dialog_title">Change Wi\u2011Fi assistant?</string>
     <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
@@ -3974,18 +3978,22 @@
     <string name="vision_settings_title">Vision Settings</string>
     <!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->
     <string name="vision_settings_description">You can customize this device to fit your needs. These accessibility features can be changed later in Settings.</string>
-    <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
-    <string name="accessibility_services_title">Services</string>
+    <!-- Title for the accessibility preference category of screen reader services and settings. [CHAR LIMIT=50] -->
+    <string name="screen_reader_category_title">Screen readers</string>
+    <!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->
+    <string name="audio_and_captions_category_title">Audio &amp; on-screen text</string>
+    <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->
+    <string name="display_category_title">Display</string>
+    <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
+    <string name="interaction_control_category_title">Interaction controls</string>
+    <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->
+    <string name="user_installed_services_category_title">Downloaded services</string>
     <!-- Title for the Talkback Accessibility Service. Displayed on the Accessibility Settings screen in Setup Wizard. [CHAR_LIMIT=25] -->
     <string name="talkback_title">Talkback</string>
     <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users and whether the service is on. [CHAR_LIMIT=none] -->
     <string name="talkback_summary">Screen reader primarily for people with blindness and low vision</string>
     <!-- Summary for the Select to Speak Accessibility Service. [CHAR_LIMIT=none] -->
     <string name="select_to_speak_summary">Tap items on your screen to hear them read aloud</string>
-    <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
-    <string name="accessibility_system_title">System</string>
-    <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
-    <string name="accessibility_display_title">Display</string>
     <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
     <string name="accessibility_captioning_title">Captions</string>
     <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
@@ -4176,10 +4184,10 @@
     <string name="disable_service_message">Tapping OK will
         stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>.</string>
 
-    <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+    <!-- Title for the prompt shown as a placeholder if no accessibility services are installed. [CHAR LIMIT=50] -->
     <string name="accessibility_no_services_installed">No services installed</string>
 
-    <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+    <!-- Default description for an accessibility service if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_default_description">No description provided.</string>
 
     <!-- Accessibility settings: button for lauching settings for an accessibility service -->
@@ -4200,7 +4208,7 @@
     <!-- Title for print service settings screen [CHAR LIMIT=25] -->
     <string name="print_settings_title">Print services</string>
 
-    <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+    <!-- Title for the prompt shown as a placeholder if no print services are installed. [CHAR LIMIT=50] -->
     <string name="print_no_services_installed">No services installed</string>
 
     <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
@@ -6068,6 +6076,7 @@
     <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
     <string name="keywords_gesture">gesture</string>
     <string name="keywords_payment_settings">pay, tap, payments</string>
+    <string name="keywords_backup">backup, back up</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -8155,6 +8164,8 @@
         <item quantity="one"><xliff:g id="count">%d</xliff:g> default app set by your admin</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> default apps set by your admin</item>
     </plurals>
+    <!-- Label explaining that the current input method was set by the admin. [CHAR LIMIT=NONE] -->
+    <string name="enterprise_privacy_input_method">Default keyboard set to <xliff:g id="app_label" example="Example Keyboard">%s</xliff:g> by your admin</string>
     <!-- Label explaining that an always-on VPN was set by the admin for the entire device. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_always_on_vpn_device">Always-on VPN turned on</string>
     <!-- Label explaining that an always-on VPN was set by the admin in the personal profile. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index ee21017..478dfe5 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -18,38 +18,42 @@
         android:title="@string/accessibility_settings"
         android:persistent="true">
 
+    <ListPreference
+            android:key="accessibility_shortcut_preference"
+            android:title="@string/accessibility_global_gesture_preference_title"/>
+
     <PreferenceCategory
-            android:key="services_category"
-            android:title="@string/accessibility_services_title">
+            android:key="user_installed_services_category"
+            android:title="@string/user_installed_services_category_title">
     </PreferenceCategory>
 
     <PreferenceCategory
-            android:key="system_category"
-            android:title="@string/accessibility_system_title">
+            android:key="screen_reader_category"
+            android:title="@string/screen_reader_category_title">
 
         <Preference
-            android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
-            android:key="captioning_preference_screen"
-            android:title="@string/accessibility_captioning_title" />
+                android:key="tts_settings_preference"
+                android:fragment="com.android.settings.tts.TextToSpeechSettings"
+                android:title="@string/tts_settings_title"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="display_category"
+            android:title="@string/display_category_title">
 
         <Preference
-            android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
-            android:key="screen_magnification_preference_screen"
-            android:title="@string/accessibility_screen_magnification_title"/>
-
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
-            android:key="font_size_preference_screen"
-            android:title="@string/title_font_size"/>
+                android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
+                android:key="font_size_preference_screen"
+                android:title="@string/title_font_size"/>
 
         <com.android.settings.display.ScreenZoomPreference
-            android:key="screen_zoom"
-            android:title="@string/screen_zoom_title"/>
+                android:key="screen_zoom"
+                android:title="@string/screen_zoom_title"/>
 
         <Preference
-            android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
-            android:key="autoclick_preference_screen"
-            android:title="@string/accessibility_autoclick_preference_title"/>
+                android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
+                android:key="screen_magnification_preference_screen"
+                android:title="@string/accessibility_screen_magnification_title"/>
 
         <SwitchPreference
                 android:key="toggle_high_text_contrast_preference"
@@ -57,6 +61,31 @@
                 android:summary="@string/experimental_preference"/>
 
         <SwitchPreference
+                android:key="toggle_inversion_preference"
+                android:title="@string/accessibility_display_inversion_preference_title"
+                android:summary="@string/accessibility_display_inversion_preference_subtitle"
+                android:persistent="false" />
+
+        <Preference
+                android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
+                android:key="daltonizer_preference_screen"
+                android:title="@string/accessibility_display_daltonizer_preference_title" />
+
+        <SwitchPreference
+                android:key="toggle_large_pointer_icon"
+                android:title="@string/accessibility_toggle_large_pointer_icon_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="interaction_control_category"
+            android:title="@string/interaction_control_category_title">
+
+        <Preference
+                android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
+                android:key="autoclick_preference_screen"
+                android:title="@string/accessibility_autoclick_preference_title"/>
+
+        <SwitchPreference
                 android:key="toggle_power_button_ends_call_preference"
                 android:title="@string/accessibility_power_button_ends_call_prerefence_title"
                 android:persistent="false"/>
@@ -66,9 +95,17 @@
                 android:title="@string/accelerometer_title"
                 android:persistent="false"/>
 
-        <SwitchPreference
-                android:key="toggle_large_pointer_icon"
-                android:title="@string/accessibility_toggle_large_pointer_icon_title" />
+        <ListPreference
+                android:key="select_long_press_timeout_preference"
+                android:title="@string/accessibility_long_press_timeout_preference_title"
+                android:entries="@array/long_press_timeout_selector_titles"
+                android:entryValues="@array/long_press_timeout_selector_values"
+                android:persistent="false"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="audio_and_captions_category"
+            android:title="@string/audio_and_captions_category_title">
 
         <SwitchPreference
                 android:key="toggle_master_mono"
@@ -76,35 +113,9 @@
                 android:summary="@string/accessibility_toggle_master_mono_summary"
                 android:persistent="false"/>
 
-        <ListPreference
-                android:key="accessibility_shortcut_preference"
-                android:title="@string/accessibility_global_gesture_preference_title"/>
-
         <Preference
-                android:key="tts_settings_preference"
-                android:fragment="com.android.settings.tts.TextToSpeechSettings"
-                android:title="@string/tts_settings_title"/>
-
-        <ListPreference android:key="select_long_press_timeout_preference"
-                android:title="@string/accessibility_long_press_timeout_preference_title"
-                android:entries="@array/long_press_timeout_selector_titles"
-                android:entryValues="@array/long_press_timeout_selector_values"
-                android:persistent="false"/>
-
+                android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
+                android:key="captioning_preference_screen"
+                android:title="@string/accessibility_captioning_title" />
     </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="display_category"
-        android:title="@string/accessibility_display_title" >
-        <SwitchPreference
-            android:key="toggle_inversion_preference"
-            android:title="@string/accessibility_display_inversion_preference_title"
-            android:summary="@string/accessibility_display_inversion_preference_subtitle"
-            android:persistent="false" />
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
-            android:key="daltonizer_preference_screen"
-            android:title="@string/accessibility_display_daltonizer_preference_title" />
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index bfb1247..992c753 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -89,6 +89,10 @@
                 settings:allowDividerBelow="true"
                 settings:multiLine="true"/>
         <com.android.settings.DividerPreference
+                android:key="input_method"
+                settings:allowDividerBelow="true"
+                settings:multiLine="true"/>
+        <com.android.settings.DividerPreference
                 android:key="global_http_proxy"
                 android:title="@string/enterprise_privacy_global_http_proxy"
                 settings:allowDividerBelow="true"
diff --git a/res/drawable/ic_dashboard_network.xml b/res/xml/network_scorer_picker_prefs.xml
similarity index 62%
copy from res/drawable/ic_dashboard_network.xml
copy to res/xml/network_scorer_picker_prefs.xml
index 6c7ee2e..fab69e7 100644
--- a/res/drawable/ic_dashboard_network.xml
+++ b/res/xml/network_scorer_picker_prefs.xml
@@ -15,12 +15,7 @@
   limitations under the License.
   -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="18.0"
-        android:viewportHeight="18.0">
-    <path
-        android:fillColor="#0b9c57"
-        android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>
-</vector>
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/network_scorer_picker_title">
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index bf1dc75..8e51009 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -59,6 +59,11 @@
             settings:keywords="@string/keywords_wifi_calling"/>
 
     <Preference
+            android:key="network_scorer_picker"
+            android:title="@string/network_scorer_picker_title"
+            android:fragment="com.android.settings.network.NetworkScorerPicker"/>
+
+    <Preference
             android:key="wifi_direct"
             android:title="@string/wifi_menu_p2p">
         <intent android:targetPackage="com.android.settings"
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
old mode 100644
new mode 100755
index c00bca4..c0b9485
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -337,7 +337,7 @@
             if (mAllowAddingApns) {
                 menu.add(0, MENU_NEW, 0,
                         getResources().getString(R.string.menu_new))
-                        .setIcon(android.R.drawable.ic_menu_add)
+                        .setIcon(R.drawable.ic_menu_add_white)
                         .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             }
             menu.add(0, MENU_RESTORE, 0,
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 0451ca4..dc70725 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1525,7 +1525,7 @@
     private void updateMobileDataAlwaysOnOptions() {
         updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
                 getActivity().getContentResolver(),
-                Settings.Global.MOBILE_DATA_ALWAYS_ON, 0) != 0);
+                Settings.Global.MOBILE_DATA_ALWAYS_ON, 1) != 0);
     }
 
     private void writeMobileDataAlwaysOnOptions() {
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index e9d810a..a44e182 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -50,7 +50,7 @@
 /**
  * Gesture lock pattern settings.
  */
-public class PrivacySettings extends SettingsPreferenceFragment implements Indexable {
+public class PrivacySettings extends SettingsPreferenceFragment {
 
     // Vendor specific
     private static final String GSETTINGS_PROVIDER = "com.google.settings";
@@ -225,49 +225,6 @@
         return R.string.help_url_backup_reset;
     }
 
-    /**
-     * For Search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new PrivacySearchIndexProvider();
-
-    private static class PrivacySearchIndexProvider extends BaseSearchIndexProvider {
-
-        boolean mIsPrimary;
-
-        public PrivacySearchIndexProvider() {
-            super();
-
-            mIsPrimary = UserHandle.myUserId() == UserHandle.USER_SYSTEM;
-        }
-
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-
-            List<SearchIndexableResource> result = new ArrayList<SearchIndexableResource>();
-
-            // For non-primary user, no backup or reset is available
-            // TODO: http://b/22388012
-            if (!mIsPrimary) {
-                return result;
-            }
-
-            SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.privacy_settings;
-            result.add(sir);
-
-            return result;
-        }
-
-        @Override
-        public List<String> getNonIndexableKeys(Context context) {
-            final List<String> nonVisibleKeys = new ArrayList<>();
-            getNonVisibleKeys(context, nonVisibleKeys);
-            return nonVisibleKeys;
-        }
-    }
-
     private static void getNonVisibleKeys(Context context, Collection<String> nonVisibleKeys) {
         final IBackupManager backupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index a96fb1e..2b486aa 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -33,7 +33,6 @@
     public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class StorageSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrivateVolumeForgetActivity extends SettingsActivity { /* empty */ }
     public static class PrivateVolumeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }
@@ -156,12 +155,6 @@
     public static class EnterprisePrivacySettingsActivity extends SettingsActivity { /* empty */ }
     public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }
 
-    // Categories.
-    public static class WirelessSettings extends SettingsActivity { /* empty */ }
-    public static class DeviceSettings extends SettingsActivity { /* empty */ }
-    public static class PersonalSettings extends SettingsActivity { /* empty */ }
-    public static class SystemSettings extends SettingsActivity { /* empty */ }
-
     // Top level categories for new IA
     public static class NetworkDashboardActivity extends SettingsActivity {}
     public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d5e886f..ffc051e 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -383,11 +383,7 @@
         final ComponentName cn = intent.getComponent();
         final String className = cn.getClassName();
 
-        mIsShowingDashboard = className.equals(Settings.class.getName())
-                || className.equals(Settings.WirelessSettings.class.getName())
-                || className.equals(Settings.DeviceSettings.class.getName())
-                || className.equals(Settings.PersonalSettings.class.getName())
-                || className.equals(Settings.WirelessSettings.class.getName());
+        mIsShowingDashboard = className.equals(Settings.class.getName());
 
         // This is a "Sub Settings" when:
         // - this is a real SubSettings
@@ -936,11 +932,6 @@
                 pm.hasSystemFeature(PackageManager.FEATURE_NFC)
                         && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
                         && adapter != null && adapter.isEnabled(), isAdmin);
-        setTileEnabled(new ComponentName(packageName,
-                        "com.android.settings.PaymentSettingsDashboardAlias"),
-                pm.hasSystemFeature(PackageManager.FEATURE_NFC)
-                        && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
-                        && adapter != null && adapter.isEnabled(), isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
                 Settings.PrintSettingsActivity.class.getName()),
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 807371e..672f4ed 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -25,6 +25,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -35,7 +36,9 @@
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityManager;
@@ -46,18 +49,17 @@
 import com.android.internal.view.RotationPolicy.RotationPolicyListener;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.SingleLineSummaryPreference;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -68,9 +70,20 @@
 public class AccessibilitySettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener, Indexable {
 
+    // Index of the first preference in a preference category.
+    private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = 0;
+
     // Preference categories
-    private static final String SERVICES_CATEGORY = "services_category";
-    private static final String SYSTEM_CATEGORY = "system_category";
+    private static final String CATEGORY_SCREEN_READER = "screen_reader_category";
+    private static final String CATEGORY_AUDIO_AND_CAPTIONS = "audio_and_captions_category";
+    private static final String CATEGORY_DISPLAY = "display_category";
+    private static final String CATEGORY_INTERACTION_CONTROL = "interaction_control_category";
+    private static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_category";
+
+    private static final String[] CATEGORIES = new String[] {
+        CATEGORY_SCREEN_READER, CATEGORY_AUDIO_AND_CAPTIONS, CATEGORY_DISPLAY,
+        CATEGORY_INTERACTION_CONTROL, CATEGORY_DOWNLOADED_SERVICES
+    };
 
     // Preferences
     private static final String TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE =
@@ -118,10 +131,7 @@
     // ID for dialog that confirms shortcut capabilities
     private static final int DIALOG_ID_ADD_SHORTCUT_WARNING = 1;
 
-    // Auxiliary members.
-    static final Set<ComponentName> sInstalledServices = new HashSet<>();
-
-    private final Map<String, String> mLongPressTimeoutValuetoTitleMap = new HashMap<>();
+    private final Map<String, String> mLongPressTimeoutValueToTitleMap = new HashMap<>();
 
     private final Handler mHandler = new Handler();
 
@@ -129,7 +139,7 @@
         @Override
         public void run() {
             if (getActivity() != null) {
-                updateServicesPreferences();
+                updateServicePreferences();
             }
         }
     };
@@ -164,7 +174,7 @@
             new SettingsContentObserver(mHandler) {
                 @Override
                 public void onChange(boolean selfChange, Uri uri) {
-                    updateServicesPreferences();
+                    updateServicePreferences();
                 }
             };
 
@@ -175,9 +185,12 @@
         }
     };
 
-    // Preference controls.
-    private PreferenceCategory mServicesCategory;
-    private PreferenceCategory mSystemsCategory;
+    private final Map<String, PreferenceCategory> mCategoryToPrefCategoryMap =
+            new ArrayMap<>();
+    private final Map<Preference, PreferenceCategory> mServicePreferenceToPreferenceCategoryMap =
+            new ArrayMap<>();
+    private final Map<ComponentName, PreferenceCategory> mPreBundledServiceComponentToCategoryMap =
+            new ArrayMap<>();
 
     private SwitchPreference mToggleHighTextContrastPreference;
     private SwitchPreference mTogglePowerButtonEndsCallPreference;
@@ -260,7 +273,7 @@
         Settings.Secure.putInt(getContentResolver(),
                 Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
         mSelectLongPressTimeoutPreference.setSummary(
-                mLongPressTimeoutValuetoTitleMap.get(stringValue));
+                mLongPressTimeoutValueToTitleMap.get(stringValue));
     }
 
     private void handleToggleInversionPreferenceChange(boolean checked) {
@@ -386,8 +399,10 @@
     }
 
     private void initializeAllPreferences() {
-        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
-        mSystemsCategory = (PreferenceCategory) findPreference(SYSTEM_CATEGORY);
+        for (int i = 0; i < CATEGORIES.length; i++) {
+            PreferenceCategory prefCategory = (PreferenceCategory) findPreference(CATEGORIES[i]);
+            mCategoryToPrefCategoryMap.put(CATEGORIES[i], prefCategory);
+        }
 
         // Text contrast.
         mToggleHighTextContrastPreference =
@@ -402,14 +417,16 @@
                 (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
         if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
                 || !Utils.isVoiceCapable(getActivity())) {
-            mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
+            mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL)
+                    .removePreference(mTogglePowerButtonEndsCallPreference);
         }
 
         // Lock screen rotation.
         mToggleLockScreenRotationPreference =
                 (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
         if (!RotationPolicy.isRotationSupported(getActivity())) {
-            mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
+            mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL)
+                    .removePreference(mToggleLockScreenRotationPreference);
         }
 
         // Large pointer icon.
@@ -424,7 +441,7 @@
         mSelectLongPressTimeoutPreference =
                 (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
         mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
-        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
+        if (mLongPressTimeoutValueToTitleMap.size() == 0) {
             String[] timeoutValues = getResources().getStringArray(
                     R.array.long_press_timeout_selector_values);
             mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
@@ -432,7 +449,7 @@
                     R.array.long_press_timeout_selector_titles);
             final int timeoutValueCount = timeoutValues.length;
             for (int i = 0; i < timeoutValueCount; i++) {
-                mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
+                mLongPressTimeoutValueToTitleMap.put(timeoutValues[i], timeoutTitles[i]);
             }
         }
 
@@ -459,17 +476,32 @@
     }
 
     private void updateAllPreferences() {
-        updateServicesPreferences();
         updateSystemPreferences();
+        updateServicePreferences();
     }
 
-    private void updateServicesPreferences() {
+    private void updateServicePreferences() {
         // Since services category is auto generated we have to do a pass
         // to generate it since services can come and go and then based on
         // the global accessibility state to decided whether it is enabled.
 
         // Generate.
-        mServicesCategory.removeAll();
+        ArrayList<Preference> servicePreferences =
+                new ArrayList<>(mServicePreferenceToPreferenceCategoryMap.keySet());
+        for (int i = 0; i < servicePreferences.size(); i++) {
+            Preference service = servicePreferences.get(i);
+            PreferenceCategory category = mServicePreferenceToPreferenceCategoryMap.get(service);
+            category.removePreference(service);
+        }
+
+        initializePreBundledServicesMapFromArray(CATEGORY_SCREEN_READER,
+                R.array.config_preinstalled_screen_reader_services);
+        initializePreBundledServicesMapFromArray(CATEGORY_AUDIO_AND_CAPTIONS,
+                R.array.config_preinstalled_audio_and_caption_services);
+        initializePreBundledServicesMapFromArray(CATEGORY_DISPLAY,
+                R.array.config_preinstalled_display_services);
+        initializePreBundledServicesMapFromArray(CATEGORY_INTERACTION_CONTROL,
+                R.array.config_preinstalled_interaction_control_services);
 
         AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
 
@@ -482,36 +514,49 @@
         final boolean accessibilityEnabled = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
 
+        PreferenceCategory downloadedServicesCategory =
+                mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES);
+        // Temporarily add the downloaded services category back if it was previously removed.
+        if (findPreference(CATEGORY_DOWNLOADED_SERVICES) == null) {
+            getPreferenceScreen().addPreference(downloadedServicesCategory);
+        }
+
         for (int i = 0, count = installedServices.size(); i < count; ++i) {
             AccessibilityServiceInfo info = installedServices.get(i);
 
-            RestrictedPreference preference =
-                    new RestrictedPreference(mServicesCategory.getContext());
+            SingleLineSummaryPreference preference =
+                    new SingleLineSummaryPreference(downloadedServicesCategory.getContext(), null);
             String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
 
+            Drawable icon = info.getResolveInfo().loadIcon(getPackageManager());
+            if (icon == null) {
+                // todo (saigem): add a default
+            }
+
             ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
-            ComponentName componentName = new ComponentName(serviceInfo.packageName,
-                    serviceInfo.name);
+            String packageName = serviceInfo.packageName;
+            ComponentName componentName = new ComponentName(packageName, serviceInfo.name);
+            String componentNameKey = componentName.flattenToString();
 
             preference.setKey(componentName.flattenToString());
 
             preference.setTitle(title);
+            preference.setIcon(icon);
             final boolean serviceEnabled = accessibilityEnabled
                     && enabledServices.contains(componentName);
-            String serviceEnabledString;
-            if (serviceEnabled) {
-                serviceEnabledString = getString(R.string.accessibility_feature_state_on);
-            } else {
-                serviceEnabledString = getString(R.string.accessibility_feature_state_off);
-            }
+            String serviceState = serviceEnabled ?
+                    getString(R.string.accessibility_feature_state_on) :
+                    getString(R.string.accessibility_feature_state_off);
+            String serviceSummary = info.loadSummary(getPackageManager());
+            serviceSummary = (TextUtils.isEmpty(serviceSummary)) ? serviceState.toUpperCase() :
+                    serviceState.toUpperCase() + " / " + serviceSummary;
 
             // Disable all accessibility services that are not permitted.
-            String packageName = serviceInfo.packageName;
             boolean serviceAllowed =
                     permittedServices == null || permittedServices.contains(packageName);
             if (!serviceAllowed && !serviceEnabled) {
                 EnforcedAdmin admin = RestrictedLockUtils.checkIfAccessibilityServiceDisallowed(
-                        getActivity(), serviceInfo.packageName, UserHandle.myUserId());
+                        getActivity(), packageName, UserHandle.myUserId());
                 if (admin != null) {
                     preference.setDisabledByAdmin(admin);
                 } else {
@@ -521,9 +566,7 @@
                 preference.setEnabled(true);
             }
 
-            preference.setSummary(serviceEnabledString);
-
-            preference.setOrder(i);
+            preference.setSummary(serviceSummary);
             preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
             preference.setPersistent(true);
 
@@ -543,26 +586,33 @@
                 extras.putString(EXTRA_SETTINGS_TITLE,
                         getString(R.string.accessibility_menu_item_settings));
                 extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
-                        new ComponentName(info.getResolveInfo().serviceInfo.packageName,
-                                settingsClassName).flattenToString());
+                        new ComponentName(packageName, settingsClassName).flattenToString());
             }
-
             extras.putParcelable(EXTRA_COMPONENT_NAME, componentName);
 
-            mServicesCategory.addPreference(preference);
+            PreferenceCategory prefCategory = downloadedServicesCategory;
+            // Set the appropriate category if the service comes pre-installed.
+            if (mPreBundledServiceComponentToCategoryMap.containsKey(componentName)) {
+                prefCategory = mPreBundledServiceComponentToCategoryMap.get(componentName);
+            }
+            preference.setOrder(FIRST_PREFERENCE_IN_CATEGORY_INDEX);
+            prefCategory.addPreference(preference);
+            mServicePreferenceToPreferenceCategoryMap.put(preference, prefCategory);
         }
 
-        if (mServicesCategory.getPreferenceCount() == 0) {
-            if (mNoServicesMessagePreference == null) {
-                mNoServicesMessagePreference = new Preference(getPrefContext());
-                mNoServicesMessagePreference.setPersistent(false);
-                mNoServicesMessagePreference.setLayoutResource(
-                        R.layout.text_description_preference);
-                mNoServicesMessagePreference.setSelectable(false);
-                mNoServicesMessagePreference.setSummary(
-                        getString(R.string.accessibility_no_services_installed));
-            }
-            mServicesCategory.addPreference(mNoServicesMessagePreference);
+        // If the user has not installed any additional services, hide the category.
+        if (downloadedServicesCategory.getPreferenceCount() == 0) {
+            PreferenceScreen screen = getPreferenceScreen();
+            screen.removePreference(downloadedServicesCategory);
+        }
+    }
+
+    private void initializePreBundledServicesMapFromArray(String categoryKey, int key) {
+        String[] services = getResources().getStringArray(key);
+        PreferenceCategory category = mCategoryToPrefCategoryMap.get(categoryKey);
+        for (int i = 0; i < services.length; i++) {
+            ComponentName component = ComponentName.unflattenFromString(services[i]);
+            mPreBundledServiceComponentToCategoryMap.put(component, category);
         }
     }
 
@@ -602,7 +652,7 @@
                 Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
         String value = String.valueOf(longPressTimeout);
         mSelectLongPressTimeoutPreference.setValue(value);
-        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
+        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValueToTitleMap.get(value));
 
         updateFeatureSummary(Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED,
                 mCaptioningPreferenceScreen);
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 801a20b..65959b4 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -76,7 +76,7 @@
             }
         }
         mAccountSynController.init(mAccount, userHandle);
-        mRemoveAccountController.setAccount(mAccount);
+        mRemoveAccountController.init(mAccount, userHandle);
     }
 
     @Override
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 6f0c110..fce88aa 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -216,7 +216,7 @@
     }
 
     private void addEnterpriseDisclosure() {
-        final CharSequence disclosure = mFeatureProvider.getDeviceOwnerDisclosure(getActivity());
+        final CharSequence disclosure = mFeatureProvider.getDeviceOwnerDisclosure();
         if (disclosure == null) {
             return;
         }
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index c8dbe4c..f331144 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -27,8 +27,10 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Process;
+import android.os.UserHandle;
 import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -49,6 +51,7 @@
 
     private Account mAccount;
     private Fragment mParentFragment;
+    private UserHandle mUserHandle;
 
     public RemoveAccountPreferenceController(Context context, Fragment parent) {
         super(context);
@@ -76,11 +79,12 @@
 
     @Override
     public void onClick(View v) {
-        ConfirmRemoveAccountDialog.show(mParentFragment, mAccount);
+        ConfirmRemoveAccountDialog.show(mParentFragment, mAccount, mUserHandle);
     }
 
-    public void setAccount(Account account) {
+    public void init(Account account, UserHandle userHandle) {
         mAccount = account;
+        mUserHandle = userHandle;
     }
 
     /**
@@ -88,27 +92,37 @@
      */
     public static class ConfirmRemoveAccountDialog extends InstrumentedDialogFragment implements
             DialogInterface.OnClickListener {
-        private static final String SAVE_ACCOUNT = "account";
+        private static final String KEY_ACCOUNT = "account";
         private static final String REMOVE_ACCOUNT_DIALOG = "confirmRemoveAccount";
         private Account mAccount;
+        private UserHandle mUserHandle;
 
-        public static ConfirmRemoveAccountDialog show(Fragment parent, Account account) {
+        public static ConfirmRemoveAccountDialog show(
+                Fragment parent, Account account, UserHandle userHandle) {
             if (!parent.isAdded()) {
                 return null;
             }
             final ConfirmRemoveAccountDialog dialog = new ConfirmRemoveAccountDialog();
-            dialog.mAccount = account;
+            Bundle bundle = new Bundle();
+            bundle.putParcelable(KEY_ACCOUNT, account);
+            bundle.putParcelable(Intent.EXTRA_USER, userHandle);
+            dialog.setArguments(bundle);
             dialog.setTargetFragment(parent, 0);
             dialog.show(parent.getFragmentManager(), REMOVE_ACCOUNT_DIALOG);
             return dialog;
         }
 
         @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            final Bundle arguments = getArguments();
+            mAccount = arguments.getParcelable(KEY_ACCOUNT);
+            mUserHandle = arguments.getParcelable(Intent.EXTRA_USER);
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
-            if (savedInstanceState != null) {
-                mAccount = (Account) savedInstanceState.getParcelable(SAVE_ACCOUNT);
-            }
             return new AlertDialog.Builder(context)
                 .setTitle(R.string.really_remove_account_title)
                 .setMessage(R.string.really_remove_account_message)
@@ -118,12 +132,6 @@
         }
 
         @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-            outState.putParcelable(SAVE_ACCOUNT, mAccount);
-        }
-
-        @Override
         public int getMetricsCategory() {
             return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_REMOVE;
         }
@@ -159,7 +167,7 @@
                                 activity.finish();
                             }
                         }
-                    }, null, Process.myUserHandle());
+                    }, null, mUserHandle);
         }
     }
 
diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java
index 6d22e25..39a31e6 100644
--- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java
+++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java
@@ -123,9 +123,8 @@
             }
         }
 
-        public int getSummary() {
-            return canInstallApps() ? R.string.external_source_trusted
-                    : R.string.external_source_untrusted;
+        public boolean isPotentialAppSource() {
+            return appOpMode != AppOpsManager.MODE_DEFAULT || permissionRequested;
         }
 
         @Override
@@ -150,7 +149,7 @@
                 return false;
             }
             InstallAppsState state = (InstallAppsState) info.extraInfo;
-            return (state.appOpMode != AppOpsManager.MODE_DEFAULT) || state.permissionRequested;
+            return state.isPotentialAppSource();
         }
     };
 }
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index b4d7526..32c8d32 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -615,28 +615,6 @@
         }
     };
 
-    public static CharSequence getSummary(AppEntry appEntry, Context context) {
-        if (appEntry.size == ApplicationsState.SIZE_INVALID
-                || appEntry.size == ApplicationsState.SIZE_UNKNOWN) {
-            return context.getText(R.string.computing_size);
-        } else {
-            CharSequence storageType = context.getString(
-                    (appEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0
-                    ? R.string.storage_type_external
-                    : R.string.storage_type_internal);
-            return context.getString(R.string.storage_summary_format,
-                    getSize(appEntry, context), storageType);
-        }
-    }
-
-    private static CharSequence getSize(AppEntry appEntry, Context context) {
-        long size = appEntry.size;
-        if (size == SIZE_INVALID) {
-            return context.getText(R.string.invalid_size_value);
-        }
-        return Formatter.formatFileSize(context, size);
-    }
-
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.APPLICATIONS_APP_STORAGE;
diff --git a/src/com/android/settings/applications/ExternalSourcesDetails.java b/src/com/android/settings/applications/ExternalSourcesDetails.java
index fd8221c..af9251c 100644
--- a/src/com/android/settings/applications/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/ExternalSourcesDetails.java
@@ -27,6 +27,7 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 public class ExternalSourcesDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
@@ -74,6 +75,18 @@
         return false;
     }
 
+    static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
+        final InstallAppsState appsState;
+        if (entry.extraInfo instanceof InstallAppsState) {
+            appsState = (InstallAppsState) entry.extraInfo;
+        } else {
+            appsState = new AppStateInstallAppsBridge(context, null, null)
+                    .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
+        }
+        return context.getString(appsState.canInstallApps() ? R.string.external_source_trusted
+                : R.string.external_source_untrusted);
+    }
+
     private void setCanInstallApps(boolean newState) {
         mAppOpsManager.setMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES,
                 mPackageInfo.applicationInfo.uid, mPackageName,
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 2ebb101..c443e73 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -16,10 +16,13 @@
 
 package com.android.settings.applications;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.Manifest.permission;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
+import android.app.LoaderManager;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
@@ -102,6 +105,8 @@
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.PermissionsSummaryHelper;
 import com.android.settingslib.applications.PermissionsSummaryHelper.PermissionsResultCallback;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
 
@@ -110,8 +115,6 @@
 import java.util.HashSet;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Activity to display application information from Settings. This activity presents
  * extended information associated with a package like code, data, total size, permissions
@@ -122,7 +125,8 @@
  * uninstall the application.
  */
 public class InstalledAppDetails extends AppInfoBase
-        implements View.OnClickListener, OnPreferenceClickListener {
+        implements View.OnClickListener, OnPreferenceClickListener,
+        LoaderManager.LoaderCallbacks<AppStorageStats> {
 
     private static final String LOG_TAG = "InstalledAppDetails";
 
@@ -137,6 +141,7 @@
     private static final int SUB_INFO_FRAGMENT = 1;
 
     private static final int LOADER_CHART_DATA = 2;
+    private static final int LOADER_STORAGE = 3;
 
     private static final int DLG_FORCE_STOP = DLG_BASE + 1;
     private static final int DLG_DISABLE = DLG_BASE + 2;
@@ -188,6 +193,8 @@
     protected ProcStatsData mStatsManager;
     protected ProcStatsPackageEntry mStats;
 
+    private AppStorageStats mLastResult;
+
     private boolean handleDisableable(Button button) {
         boolean disableable = false;
         // Try to prevent the user from bricking their phone
@@ -350,13 +357,14 @@
         if (mFinishing) {
             return;
         }
-        mState.requestSize(mPackageName, mUserId);
         AppItem app = new AppItem(mAppEntry.info.uid);
         app.addUid(mAppEntry.info.uid);
         if (mStatsSession != null) {
-            getLoaderManager().restartLoader(LOADER_CHART_DATA,
+            LoaderManager loaderManager = getLoaderManager();
+            loaderManager.restartLoader(LOADER_CHART_DATA,
                     ChartDataLoader.buildArgs(getTemplate(getContext()), app),
                     mDataCallbacks);
+            loaderManager.restartLoader(LOADER_STORAGE, Bundle.EMPTY, this);
         }
         new BatteryUpdater().execute();
         new MemoryUpdater().execute();
@@ -497,6 +505,23 @@
         }
     }
 
+    @Override
+    public Loader<AppStorageStats> onCreateLoader(int id, Bundle args) {
+        Context context = getContext();
+        return new FetchPackageStorageAsyncLoader(
+                context, new StorageStatsSource(context), mAppEntry.info, UserHandle.of(mUserId));
+    }
+
+    @Override
+    public void onLoadFinished(Loader<AppStorageStats> loader, AppStorageStats result) {
+        mLastResult = result;
+        refreshUi();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<AppStorageStats> loader) {
+    }
+
     // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
         final View appSnippet = mHeader.findViewById(R.id.app_snippet);
@@ -594,7 +619,8 @@
 
         // Update the preference summaries.
         Activity context = getActivity();
-        mStoragePreference.setSummary(AppStorageSettings.getSummary(mAppEntry, context));
+        boolean isExternal = ((mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0);
+        mStoragePreference.setSummary(getStorageSummary(context, mLastResult, isExternal));
 
         PermissionsSummaryHelper.getPermissionSummary(getContext(),
                 mPackageName, mPermissionCallback);
@@ -663,6 +689,25 @@
         return getString(R.string.computing_size);
     }
 
+    @VisibleForTesting
+    static CharSequence getStorageSummary(
+            Context context, AppStorageStats stats, boolean isExternal) {
+        if (stats == null) {
+            return context.getText(R.string.computing_size);
+        } else {
+            CharSequence storageType = context.getString(isExternal
+                    ? R.string.storage_type_external
+                    : R.string.storage_type_internal);
+            return context.getString(R.string.storage_summary_format,
+                    getSize(context, stats), storageType);
+        }
+    }
+
+    private static CharSequence getSize(Context context, AppStorageStats stats) {
+        return Formatter.formatFileSize(context, stats.getTotalBytes());
+    }
+
+
     @Override
     protected AlertDialog createDialog(int id, int errorCode) {
         switch (id) {
@@ -933,7 +978,9 @@
                 PictureInPictureSettings.checkPackageHasPictureInPictureActivities(
                         packageInfoWithActivities.packageName,
                         packageInfoWithActivities.activities);
-        if (hasDrawOverOtherApps || hasWriteSettings || hasPictureInPictureActivities) {
+        boolean isPotentialAppSource = isPotentialAppSource();
+        if (hasDrawOverOtherApps || hasWriteSettings || hasPictureInPictureActivities ||
+                isPotentialAppSource) {
             PreferenceCategory category = new PreferenceCategory(getPrefContext());
             category.setTitle(R.string.advanced_apps);
             screen.addPreference(category);
@@ -983,11 +1030,32 @@
                 });
                 category.addPreference(pref);
             }
+            if (isPotentialAppSource) {
+                Preference pref = new Preference(getPrefContext());
+                pref.setTitle(R.string.install_other_apps);
+                pref.setKey("install_other_apps");
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        startAppInfoFragment(ExternalSourcesDetails.class,
+                                getString(R.string.install_other_apps));
+                        return true;
+                    }
+                });
+                category.addPreference(pref);
+            }
         }
 
         addAppInstallerInfoPref(screen);
     }
 
+    private boolean isPotentialAppSource() {
+        AppStateInstallAppsBridge.InstallAppsState appState =
+                new AppStateInstallAppsBridge(getContext(), null, null)
+                        .createInstallAppsStateFor(mPackageName, mPackageInfo.applicationInfo.uid);
+        return appState.isPotentialAppSource();
+    }
+
     private void addAppInstallerInfoPref(PreferenceScreen screen) {
         String installerPackageName = null;
         try {
@@ -1073,6 +1141,10 @@
         if (pref != null) {
             pref.setSummary(WriteSettingsDetails.getSummary(getContext(), mAppEntry));
         }
+        pref = findPreference("install_other_apps");
+        if (pref != null) {
+            pref.setSummary(ExternalSourcesDetails.getPreferenceSummary(getContext(), mAppEntry));
+        }
     }
 
     /**
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index a8acfb8..826e5db 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1348,8 +1348,8 @@
                     break;
 
                 case LIST_TYPE_MANAGE_SOURCES:
-                    holder.summary
-                            .setText(((InstallAppsState) holder.entry.extraInfo).getSummary());
+                    holder.summary.setText(ExternalSourcesDetails.getPreferenceSummary(mContext,
+                            holder.entry));
                     break;
 
                 default:
diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index f5c7ff8..f8bab3d 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -18,18 +18,29 @@
 
 import android.app.Activity;
 import android.app.FragmentManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
+import com.android.settings.R;
+
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * The activity used to launch the configured Backup activity or the preference screen
  * if the manufacturer provided their backup settings.
  */
-public class BackupSettingsActivity extends Activity {
+public class BackupSettingsActivity extends Activity implements Indexable {
     private static final String TAG = "BackupSettingsActivity";
     private FragmentManager mFragmentManager;
 
@@ -68,6 +79,52 @@
         }
     }
 
+    /**
+     * For Search.
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                private static final String BACKUP_SEARCH_INDEX_KEY = "backup";
+
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>();
+
+                    // Add the activity title
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = context.getResources().getString(R.string.privacy_settings_title);
+                    data.screenTitle = context.getResources().getString(
+                            R.string.privacy_settings_title);
+                    data.keywords = context.getResources().getString(
+                            R.string.keywords_backup);
+                    data.intentTargetPackage = context.getPackageName();
+                    data.intentTargetClass = BackupSettingsActivity.class.getName();
+                    data.intentAction = "android.intent.action.MAIN";
+                    data.key = BACKUP_SEARCH_INDEX_KEY;
+                    result.add(data);
+
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = new ArrayList<String>();
+
+                    // For non-primary user, no backup is available, so don't show it in search
+                    // TODO: http://b/22388012
+                    if (UserHandle.myUserId() != UserHandle.USER_SYSTEM) {
+                        if (Log.isLoggable(TAG, Log.DEBUG)) {
+                            Log.d(TAG, "Not a system user, not indexing the screen");
+                        }
+                        keys.add(BACKUP_SEARCH_INDEX_KEY);
+                    }
+
+                    return keys;
+                }
+            };
+
     @VisibleForTesting
     void setFragmentManager(FragmentManager fragmentManager) {
         mFragmentManager = fragmentManager;
diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java
index dcc1608..a451272 100644
--- a/src/com/android/settings/backup/BackupSettingsFragment.java
+++ b/src/com/android/settings/backup/BackupSettingsFragment.java
@@ -18,11 +18,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
-
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -32,7 +27,6 @@
 import com.android.settings.search.Indexable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -72,15 +66,10 @@
         return controllers;
     }
 
+    // The intention is to index {@link BackupSettingsActivity} instead of the fragments,
+    // therefore leaving this index provider empty.
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.backup_settings;
-                    return Arrays.asList(sir);
-                }
             };
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 99c46bf..acb99a6 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -99,6 +99,8 @@
 
     private final IntentFilter mIntentFilter;
 
+    // For Search
+    private static final String DATA_KEY_REFERENCE = "main_toggle_bluetooth";
 
     // accessed from inner class (not private to avoid thunks)
     FooterPreference mMyDevicePreference;
@@ -567,6 +569,7 @@
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = res.getString(R.string.bluetooth_settings);
                     data.screenTitle = res.getString(R.string.bluetooth_settings);
+                    data.key = DATA_KEY_REFERENCE;
                     result.add(data);
 
                     // Add cached paired BT devices
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 742f727..59c5014 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -243,47 +243,38 @@
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
-            //wireless_section
-            Settings.WifiSettingsActivity.class.getName(),
-            Settings.BluetoothSettingsActivity.class.getName(),
-            Settings.SimSettingsActivity.class.getName(),
-            //device_section
-            Settings.SoundSettingsActivity.class.getName(),
-            Settings.DisplaySettingsActivity.class.getName(),
-            Settings.StorageSettingsActivity.class.getName(),
-            Settings.ManageApplicationsActivity.class.getName(),
-            Settings.PowerUsageSummaryActivity.class.getName(),
-            //personal_section
-            Settings.LocationSettingsActivity.class.getName(),
-            Settings.SecuritySettingsActivity.class.getName(),
-            Settings.UserSettingsActivity.class.getName(),
-            //system_section
-            Settings.DateTimeSettingsActivity.class.getName(),
-            Settings.DeviceInfoSettingsActivity.class.getName(),
-            Settings.AccessibilitySettingsActivity.class.getName(),
-            Settings.PrintSettingsActivity.class.getName(),
-            Settings.PaymentSettingsActivity.class.getName(),
-
-
             // New IA
             // Home page
             Settings.NetworkDashboardActivity.class.getName(),
             Settings.ConnectedDeviceDashboardActivity.class.getName(),
-            Settings.WifiDisplaySettingsActivity.class.getName(),
             Settings.AppAndNotificationDashboardActivity.class.getName(),
+            Settings.DisplaySettingsActivity.class.getName(),
+            Settings.SoundSettingsActivity.class.getName(),
             Settings.StorageDashboardActivity.class.getName(),
-            "com.android.settings.SoundDashboardAlias",
-            "com.android.settings.UsersDashboardAlias",
+            Settings.PowerUsageSummaryActivity.class.getName(),
             Settings.UserAndAccountDashboardActivity.class.getName(),
+            Settings.SecuritySettingsActivity.class.getName(),
+            Settings.AccessibilitySettingsActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
             Settings.SupportDashboardActivity.class.getName(),
-            // Home page > Apps & Notifications
-            "com.android.settings.ManageApplicationsDashboardAlias",
-            "com.android.settings.PaymentSettingsDashboardAlias",
             // Home page > Network & Internet
+            Settings.WifiSettingsActivity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
+            Settings.SimSettingsActivity.class.getName(),
+            // Home page > Connected devices
+            Settings.BluetoothSettingsActivity.class.getName(),
+            Settings.WifiDisplaySettingsActivity.class.getName(),
+            Settings.PrintSettingsActivity.class.getName(),
+            // Home page > Apps & Notifications
+            Settings.UserSettingsActivity.class.getName(),
+            Settings.ManageApplicationsActivity.class.getName(),
+            Settings.PaymentSettingsActivity.class.getName(),
+            // Home page > Security & screen lock
+            Settings.LocationSettingsActivity.class.getName(),
             // Home page > System
             Settings.LanguageAndInputSettingsActivity.class.getName(),
+            Settings.DateTimeSettingsActivity.class.getName(),
+            Settings.DeviceInfoSettingsActivity.class.getName(),
             Settings.EnterprisePrivacySettingsActivity.class.getName(),
     };
 }
diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
index a5efcc1..6c23b39 100644
--- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
+++ b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
@@ -21,6 +21,7 @@
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.text.TextUtils;
+import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.overlay.FeatureFactory;
@@ -111,13 +112,17 @@
             return;
         }
         // Pref key exists in set, log it's change in metrics.
-        mMetricsFeature.count(mContext, prefKey + "|" + value, 1);
+        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
+                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_VALUE, value));
     }
 
     private void logPackageName(String key, String value) {
-        mMetricsFeature.count(mContext, mTag + "/" + key, 1);
+        final String prefKey = mTag + "/" + key;
+        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
+                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey));
         mMetricsFeature.action(mContext, MetricsEvent.ACTION_GENERIC_PACKAGE,
-                mTag + "/" + key + "|" + value);
+                prefKey + "|" + value);
     }
 
     private void safeLogValue(String key, String value) {
diff --git a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
index 0a1a628..abe1427 100644
--- a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
+++ b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
@@ -88,4 +88,11 @@
         super.onPause();
     }
 
+    @CallSuper
+    @Override
+    public void onDestroy() {
+        mLifecycle.onDestroy();
+        super.onDestroy();
+    }
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index b10f39e..07d4806 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -405,7 +405,8 @@
         popup.show();
     }
 
-    private void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
+    @VisibleForTesting
+    void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
             .SuggestionHeaderData data) {
         final boolean moreSuggestions = data.hasMoreSuggestions;
         final int undisplayedSuggestionCount = data.undisplayedSuggestionCount;
@@ -435,10 +436,8 @@
                 final int suggestionMode;
                 if (moreSuggestions) {
                     suggestionMode = DashboardData.SUGGESTION_MODE_EXPANDED;
-                    List<Tile> expandedSuggestions = mDashboardData.getSuggestions().subList(
-                            DashboardData.DEFAULT_SUGGESTION_COUNT,
-                            mDashboardData.getSuggestions().size());
-                    for (Tile suggestion : expandedSuggestions) {
+
+                    for (Tile suggestion : mDashboardData.getSuggestions()) {
                         String suggestionId =
                                 DashboardAdapter.getSuggestionIdentifier(mContext, suggestion);
                         if (!mSuggestionsShownLogged.contains(suggestionId)) {
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
index 6ae03da..d6071c7 100644
--- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -24,6 +24,7 @@
 import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
+import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -119,10 +120,26 @@
     @Override
     public void onLoadFinished(Loader<SparseArray<AppsStorageResult>> loader,
             SparseArray<AppsStorageResult> result) {
-        mPreferenceController.onLoadFinished(result.get(mUserId));
+        mPreferenceController.onLoadFinished(scrubAppsFromResult(result.get(mUserId)));
     }
 
     @Override
     public void onLoaderReset(Loader<SparseArray<AppsStorageResult>> loader) {
     }
+
+    @VisibleForTesting
+    void setPreferenceController(StorageItemPreferenceController controller) {
+        mPreferenceController = controller;
+    }
+
+    private AppsStorageResult scrubAppsFromResult(AppsStorageResult result) {
+        if (result == null) {
+            return null;
+        }
+
+        result.gamesSize = 0;
+        result.musicAppsSize = 0;
+        result.otherAppsSize = 0;
+        return result;
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 7487b28..2fa1b18 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -173,6 +173,8 @@
     }
 
     public void onLoadFinished(StorageAsyncLoader.AppsStorageResult data) {
+        // TODO(b/35927909): Figure out how to split out apps which are only installed for work
+        //       profiles in order to attribute those app's code bytes only to that profile.
         mPhotoPreference.setStorageSize(
                 data.externalStats.imageBytes + data.externalStats.videoBytes);
         mAudioPreference.setStorageSize(data.musicAppsSize + data.externalStats.audioBytes);
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
index 014092f..29f315c 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
@@ -17,6 +17,7 @@
 package com.android.settings.enterprise;
 
 import android.content.ComponentName;
+import android.os.UserHandle;
 import android.support.annotation.Nullable;
 
 /**
@@ -89,4 +90,11 @@
      * @see android.app.admin.DevicePolicyManager#getLastNetworkLogRetrievalTime
      */
     long getLastNetworkLogRetrievalTime();
+
+    /**
+     * Calls {@code DevicePolicyManager.isCurrentInputMethodSetByOwner()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#isCurrentInputMethodSetByOwner
+     */
+    boolean isCurrentInputMethodSetByOwner();
 }
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
index 210faec..0fdcb9c 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
@@ -18,6 +18,7 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.os.UserHandle;
 import android.support.annotation.Nullable;
 
 public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrapper {
@@ -72,4 +73,9 @@
     public long getLastNetworkLogRetrievalTime() {
         return mDpm.getLastNetworkLogRetrievalTime();
     }
+
+    @Override
+    public boolean isCurrentInputMethodSetByOwner() {
+        return mDpm.isCurrentInputMethodSetByOwner();
+    }
 }
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
index 79b12e6..30b74f5 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
 import java.util.Date;
 
 public interface EnterprisePrivacyFeatureProvider {
@@ -37,10 +35,8 @@
      * Returns a message informing the user that the device is managed by a Device Owner app. The
      * message includes a Learn More link that takes the user to the enterprise privacy section of
      * Settings. If the device is not managed by a Device Owner app, returns {@code null}.
-     *
-     * @param context The context in which to show the enterprise privacy section of Settings
      */
-    CharSequence getDeviceOwnerDisclosure(Context context);
+    CharSequence getDeviceOwnerDisclosure();
 
     /**
      * Returns the time at which the Device Owner last retrieved security logs, or {@code null} if
@@ -86,4 +82,10 @@
      * user's managed profile (if any) is wiped, or zero if no such limit is set.
      */
     int getMaximumFailedPasswordsBeforeWipeInManagedProfile();
+
+    /**
+     * Returns the label of the current user's input method if that input method was set by a Device
+     * Owner or Profile Owner in that user. Otherwise, returns {@code null}.
+     */
+    String getImeLabelIfOwnerSet();
 }
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 645a1f5..49d87a5 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -17,8 +17,10 @@
 package com.android.settings.enterprise;
 
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
@@ -39,6 +41,7 @@
 
 public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFeatureProvider {
 
+    private final Context mContext;
     private final DevicePolicyManagerWrapper mDpm;
     private final PackageManagerWrapper mPm;
     private final UserManager mUm;
@@ -47,9 +50,10 @@
 
     private static final int MY_USER_ID = UserHandle.myUserId();
 
-    public EnterprisePrivacyFeatureProviderImpl(DevicePolicyManagerWrapper dpm,
+    public EnterprisePrivacyFeatureProviderImpl(Context context, DevicePolicyManagerWrapper dpm,
             PackageManagerWrapper pm, UserManager um, ConnectivityManagerWrapper cm,
             Resources resources) {
+        mContext = context.getApplicationContext();
         mDpm = dpm;
         mPm = pm;
         mUm = um;
@@ -80,7 +84,7 @@
     }
 
     @Override
-    public CharSequence getDeviceOwnerDisclosure(Context context) {
+    public CharSequence getDeviceOwnerDisclosure() {
         if (!hasDeviceOwner()) {
             return null;
         }
@@ -95,7 +99,7 @@
         }
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
-                new EnterprisePrivacySpan(context), 0);
+                new EnterprisePrivacySpan(mContext), 0);
         return disclosure;
     }
 
@@ -156,6 +160,24 @@
         return mDpm.getMaximumFailedPasswordsForWipe(profileOwner, userId);
     }
 
+    @Override
+    public String getImeLabelIfOwnerSet() {
+        if (!mDpm.isCurrentInputMethodSetByOwner()) {
+            return null;
+        }
+        final String packageName = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                Settings.Secure.DEFAULT_INPUT_METHOD, MY_USER_ID);
+        if (packageName == null) {
+            return null;
+        }
+        try {
+            return mPm.getApplicationInfoAsUser(packageName, 0 /* flags */, MY_USER_ID)
+                    .loadLabel(mPm.getPackageManager()).toString();
+        } catch (PackageManager.NameNotFoundException e) {
+            return null;
+        }
+    }
+
     protected static class EnterprisePrivacySpan extends ClickableSpan {
         private final Context mContext;
 
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index 821b7ff..3929bbd 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -65,6 +65,7 @@
         controllers.add(new GlobalHttpProxyPreferenceController(context));
         controllers.add(new FailedPasswordWipePrimaryUserPreferenceController(context));
         controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context));
+        controllers.add(new ImePreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
new file mode 100644
index 0000000..18dfac7
--- /dev/null
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+public class ImePreferenceController extends PreferenceController {
+
+    private static final String KEY_INPUT_METHOD = "input_method";
+    private final EnterprisePrivacyFeatureProvider mFeatureProvider;
+
+    public ImePreferenceController(Context context) {
+        super(context);
+        mFeatureProvider = FeatureFactory.getFactory(context)
+                .getEnterprisePrivacyFeatureProvider(context);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String ownerSetIme = mFeatureProvider.getImeLabelIfOwnerSet();
+        if (ownerSetIme == null) {
+            preference.setVisible(false);
+            return;
+        }
+        preference.setTitle(mContext.getResources().getString(
+            R.string.enterprise_privacy_input_method, ownerSetIme));
+        preference.setVisible(true);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_INPUT_METHOD;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 58b15a5..96ac042 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -56,7 +56,8 @@
             UsageType.BLUETOOTH,
             UsageType.USER,
             UsageType.IDLE,
-            UsageType.APP};
+            UsageType.APP,
+            UsageType.UNACCOUNTED};
     private BatteryHistoryPreference mHistPref;
     private PreferenceGroup mUsageListGroup;
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
@@ -111,7 +112,7 @@
         mUsageListGroup.removeAll();
         for (int i = 0, size = dataList.size(); i < size; i++) {
             final PowerUsageData batteryData = dataList.get(i);
-            final PowerGaugePreference pref = new PowerGaugePreference(getContext());
+            final PowerGaugePreference pref = new PowerGaugePreference(getPrefContext());
 
             pref.setTitle(batteryData.titleResId);
             pref.setSummary(batteryData.summary);
@@ -136,6 +137,8 @@
             return UsageType.USER;
         } else if (drainType == DrainType.CELL) {
             return UsageType.CELL;
+        } else if (drainType == DrainType.UNACCOUNTED) {
+            return UsageType.UNACCOUNTED;
         } else if (mPowerUsageFeatureProvider.isTypeSystem(sipper)) {
             return UsageType.SYSTEM;
         } else if (mPowerUsageFeatureProvider.isTypeService(sipper)) {
@@ -197,7 +200,8 @@
                 UsageType.SYSTEM,
                 UsageType.BLUETOOTH,
                 UsageType.USER,
-                UsageType.IDLE})
+                UsageType.IDLE,
+                UsageType.UNACCOUNTED})
         public @interface UsageType {
             int APP = 0;
             int WIFI = 1;
@@ -207,6 +211,7 @@
             int BLUETOOTH = 5;
             int USER = 6;
             int IDLE = 7;
+            int UNACCOUNTED = 8;
         }
 
         @StringRes
@@ -246,6 +251,8 @@
                     return R.string.power_user;
                 case UsageType.IDLE:
                     return R.string.power_idle;
+                case UsageType.UNACCOUNTED:
+                    return R.string.power_unaccounted;
                 case UsageType.APP:
                 default:
                     return R.string.power_apps;
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index ace9e0a..a0ccf20 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -95,7 +95,7 @@
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(airplaneModePreferenceController);
         controllers.add(mobileNetworkPreferenceController);
-        controllers.add(new TetherPreferenceController(context));
+        controllers.add(new TetherPreferenceController(context, lifecycle));
         controllers.add(vpnPreferenceController);
         controllers.add(new ProxyPreferenceController(context));
         controllers.add(mobilePlanPreferenceController);
diff --git a/src/com/android/settings/network/NetworkScoreManagerWrapper.java b/src/com/android/settings/network/NetworkScoreManagerWrapper.java
new file mode 100644
index 0000000..0d35378
--- /dev/null
+++ b/src/com/android/settings/network/NetworkScoreManagerWrapper.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import android.annotation.Nullable;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppData;
+
+import java.util.List;
+
+/**
+ * Wrapper around {@link NetworkScoreManager} to facilitate unit testing.
+ *
+ * TODO: delete this class once robolectric supports Android O
+ */
+public class NetworkScoreManagerWrapper {
+    private final NetworkScoreManager mNetworkScoreManager;
+
+    public NetworkScoreManagerWrapper(NetworkScoreManager networkScoreManager) {
+        mNetworkScoreManager = networkScoreManager;
+    }
+
+    /**
+     * Returns the list of available scorer apps. The list will be empty if there are
+     * no valid scorers.
+     */
+    public List<NetworkScorerAppData> getAllValidScorers() {
+        return mNetworkScoreManager.getAllValidScorers();
+    }
+
+    /**
+     * Obtain the package name of the current active network scorer.
+     *
+     * <p>At any time, only one scorer application will receive {@link #ACTION_SCORE_NETWORKS}
+     * broadcasts and be allowed to call {@link #updateScores}. Applications may use this method to
+     * determine the current scorer and offer the user the ability to select a different scorer via
+     * the {@link #ACTION_CHANGE_ACTIVE} intent.
+     * @return the full package name of the current active scorer, or null if there is no active
+     *         scorer.
+     */
+    @Nullable
+    public String getActiveScorerPackage() {
+        return mNetworkScoreManager.getActiveScorerPackage();
+    }
+
+
+    /**
+     * Set the active scorer to a new package and clear existing scores.
+     *
+     * <p>Should never be called directly without obtaining user consent. This can be done by using
+     * the {@link #ACTION_CHANGE_ACTIVE} broadcast, or using a custom configuration activity.
+     *
+     * @return true if the operation succeeded, or false if the new package is not a valid scorer.
+     * @throws SecurityException if the caller is not a system process or does not hold the
+     *         {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} permission
+     */
+    public boolean setActiveScorer(String packageName) throws SecurityException {
+        return mNetworkScoreManager.setActiveScorer(packageName);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java
new file mode 100644
index 0000000..da9d84f
--- /dev/null
+++ b/src/com/android/settings/network/NetworkScorerPicker.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import android.content.Context;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppData;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.settings.R;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.core.instrumentation.Instrumentable;
+import com.android.settings.widget.RadioButtonPreference;
+
+import java.util.List;
+
+/**
+ * Fragment for choosing default network scorer.
+ */
+public class NetworkScorerPicker extends InstrumentedPreferenceFragment implements
+        RadioButtonPreference.OnClickListener {
+
+    private NetworkScoreManagerWrapper mNetworkScoreManager;
+
+    @Override
+    public int getMetricsCategory() {
+        //TODO(35854268): Add logging.
+        return Instrumentable.METRICS_CATEGORY_UNKNOWN;
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        super.onCreatePreferences(savedInstanceState, rootKey);
+        addPreferencesFromResource(R.xml.network_scorer_picker_prefs);
+        updateCandidates();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mNetworkScoreManager = createNetworkScorerManagerWrapper(context);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        final View view = super.onCreateView(inflater, container, savedInstanceState);
+        // this is needed so the back button goes back to previous fragment
+        setHasOptionsMenu(true);
+        return view;
+    }
+
+    @VisibleForTesting
+    public void updateCandidates() {
+        final PreferenceScreen screen = getPreferenceScreen();
+        screen.removeAll();
+
+        final List<NetworkScorerAppData> scorers = mNetworkScoreManager.getAllValidScorers();
+        if (scorers.isEmpty()) {
+            final RadioButtonPreference nonePref = new RadioButtonPreference(getPrefContext());
+            nonePref.setTitle(R.string.network_scorer_picker_none_preference);
+            nonePref.setChecked(true);
+            screen.addPreference(nonePref);
+            return;
+        }
+        final String defaultAppKey = getActiveScorerPackage();
+        final int numScorers = scorers.size();
+        for (int i = 0; i < numScorers; i++) {
+            final RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
+            final NetworkScorerAppData appData = scorers.get(i);
+            final String appKey = appData.getRecommendationServicePackageName();
+            pref.setTitle(appData.getRecommendationServiceLabel());
+            pref.setKey(appKey);
+            pref.setChecked(TextUtils.equals(defaultAppKey, appKey));
+            pref.setOnClickListener(this);
+            screen.addPreference(pref);
+        }
+    }
+
+    private String getActiveScorerPackage() {
+        return mNetworkScoreManager.getActiveScorerPackage();
+    }
+
+    private boolean setActiveScorer(String key) {
+        if (!TextUtils.equals(key, getActiveScorerPackage())) {
+            return mNetworkScoreManager.setActiveScorer(key);
+        }
+        return false;
+    }
+
+    @Override
+    public void onRadioButtonClicked(RadioButtonPreference selected) {
+        final String selectedKey = selected.getKey();
+        final boolean success = setActiveScorer(selectedKey);
+        if (success) {
+            updateCheckedState(selectedKey);
+        }
+    }
+
+    private void updateCheckedState(String selectedKey) {
+        final PreferenceScreen screen = getPreferenceScreen();
+        final int count = screen.getPreferenceCount();
+        for (int i = 0; i < count; i++) {
+            final Preference pref = screen.getPreference(i);
+            if (pref instanceof RadioButtonPreference) {
+                final RadioButtonPreference radioPref = (RadioButtonPreference) pref;
+                radioPref.setChecked(TextUtils.equals(pref.getKey(), selectedKey));
+            }
+        }
+    }
+
+    @VisibleForTesting
+    NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
+        return new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
+    }
+}
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 5b8d55e..f23118a 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -28,6 +28,9 @@
 import com.android.settings.R;
 import com.android.settings.TetherSettings;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnDestroy;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -35,7 +38,8 @@
 import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
 import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
-public class TetherPreferenceController extends PreferenceController {
+public class TetherPreferenceController extends PreferenceController
+        implements LifecycleObserver, OnDestroy {
 
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
 
@@ -62,12 +66,12 @@
     TetherPreferenceController() {
         super(null);
         mAdminDisallowedTetherConfig = false;
-        mBluetoothPan = null;
+        mBluetoothPan = new AtomicReference<>();
         mConnectivityManager = null;
-        mBluetoothAdapter = null;
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
 
-    public TetherPreferenceController(Context context) {
+    public TetherPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mBluetoothPan = new AtomicReference<>();
         mAdminDisallowedTetherConfig = checkIfRestrictionEnforced(
@@ -75,6 +79,9 @@
         mConnectivityManager =
                 (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
         if (mBluetoothAdapter != null) {
             mBluetoothAdapter.getProfileProxy(context, mBtProfileServiceListener,
                     BluetoothProfile.PAN);
@@ -113,6 +120,14 @@
         return KEY_TETHER_SETTINGS;
     }
 
+    @Override
+    public void onDestroy() {
+        final BluetoothProfile profile = mBluetoothPan.getAndSet(null);
+        if (profile != null && mBluetoothAdapter != null) {
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN, profile);
+        }
+    }
+
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     void updateSummary() {
         if (mPreference == null) {
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index e72ee03..5b039b2 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -116,7 +116,7 @@
     @Override
     public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
         if (mEnterprisePrivacyFeatureProvider == null) {
-            mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(
+            mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(context,
                     new DevicePolicyManagerWrapperImpl((DevicePolicyManager) context
                             .getSystemService(Context.DEVICE_POLICY_SERVICE)),
                     new PackageManagerWrapperImpl(context.getPackageManager()),
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 6cfc9a6..362a9c4 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -37,6 +37,7 @@
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.backup.BackupSettingsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
@@ -152,7 +153,7 @@
         addIndex(AvailableVirtualKeyboardFragment.class,
                 NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(PhysicalKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(PrivacySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
+        addIndex(BackupSettingsActivity.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
         addIndex(BackupSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
         addIndex(DateTimeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_date_time);
         addIndex(AccessibilitySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accessibility);
diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search2/CursorToSearchResultConverter.java
index 880a65b..71d999e 100644
--- a/src/com/android/settings/search2/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/search2/CursorToSearchResultConverter.java
@@ -35,6 +35,7 @@
 import com.android.settings.dashboard.SiteMapManager;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -77,6 +78,22 @@
 
     private final Set<String> mKeys;
 
+    private final int LONG_TITLE_LENGTH = 20;
+
+    private static final String[] whiteList = {
+            "main_toggle_wifi",
+            "main_toggle_bluetooth",
+            "toggle_airplane",
+            "tether_settings",
+            "battery_saver",
+            "toggle_nfc",
+            "restrict_background",
+            "data_usage_enable",
+            "button_roaming_key",
+    };
+    private static final Set<String> prioritySettings = new HashSet(Arrays.asList(whiteList));
+
+
     public CursorToSearchResultConverter(Context context, String queryText) {
         mContext = context;
         mKeys = new HashSet<>();
@@ -135,7 +152,7 @@
         }
 
         final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
-        final int rank = getRank(breadcrumbs, baseRank);
+        final int rank = getRank(title, breadcrumbs, baseRank, key);
 
         final SearchResult.Builder builder = new SearchResult.Builder();
         builder.addTitle(title)
@@ -225,18 +242,32 @@
     }
 
     /** Uses the breadcrumbs to determine the offset to the base rank.
-     *  There are two checks
-     *  A) If the query matches the highest level menu title
-     *  B) If the query matches a subsequent menu title
+     *  There are three checks
+     *  A) If the result is prioritized and the highest base level
+     *  B) If the query matches the highest level menu title
+     *  C) If the query matches a subsequent menu title
+     *  D) Is the title longer than 20
      *
-     *  If the query matches A and B, the offset is 0.
-     *  If the query matches A only, the offset is 1.
-     *  If the query matches neither A nor B, the offset is 2.
+     *  If the query matches A, set it to TOP_RANK
+     *  If the query matches B and C, the offset is 0.
+     *  If the query matches C only, the offset is 1.
+     *  If the query matches neither B nor C, the offset is 2.
+     *  If the query matches D, the offset is 2
+
+     * @param title of the result.
      * @param crumbs from the Information Architecture
      * @param baseRank of the result. Lower if it's a better result.
      * @return
      */
-    private int getRank(List<String> crumbs, int baseRank) {
+    private int getRank(String title, List<String> crumbs, int baseRank, String key) {
+        // The result can only be prioritized if it is a top ranked result.
+        if (prioritySettings.contains(key) && baseRank < DatabaseResultLoader.BASE_RANKS[1]) {
+            return SearchResult.TOP_RANK;
+        }
+        if (title.length() > LONG_TITLE_LENGTH) {
+            return baseRank + 2;
+        }
         return baseRank;
     }
+
 }
diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search2/DatabaseResultLoader.java
index ad1e6a9..5892ebc 100644
--- a/src/com/android/settings/search2/DatabaseResultLoader.java
+++ b/src/com/android/settings/search2/DatabaseResultLoader.java
@@ -97,7 +97,7 @@
      * If the query only matches keywords or entries, the best rank it can be is 9
      *
      */
-    private static final int[] BASE_RANKS = {1, 3, 7, 9};
+    public static final int[] BASE_RANKS = {1, 3, 7, 9};
 
     private final String mQueryText;
     private final Context mContext;
diff --git a/src/com/android/settings/search2/SearchResult.java b/src/com/android/settings/search2/SearchResult.java
index a82c47f..6b27d89 100644
--- a/src/com/android/settings/search2/SearchResult.java
+++ b/src/com/android/settings/search2/SearchResult.java
@@ -27,10 +27,15 @@
 public class SearchResult implements Comparable<SearchResult> {
 
     /**
-     * Defines the max rank for a search result to be considered as ranked. Results with ranks
+     * Defines the lowest rank for a search result to be considered as ranked. Results with ranks
      * higher than this have no guarantee for sorting order.
      */
-    public static final int MAX_RANK  = 10;
+    public static final int BOTTOM_RANK = 10;
+
+    /**
+     * Defines the highest rank for a search result. Used for special search results only.
+     */
+    public static final int TOP_RANK = 0;
 
     /**
      * The title of the result and main text displayed.
diff --git a/src/com/android/settings/search2/SearchResultsAdapter.java b/src/com/android/settings/search2/SearchResultsAdapter.java
index afe432a..5151b64 100644
--- a/src/com/android/settings/search2/SearchResultsAdapter.java
+++ b/src/com/android/settings/search2/SearchResultsAdapter.java
@@ -32,7 +32,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.android.settings.search2.SearchResult.MAX_RANK;
+import static com.android.settings.search2.SearchResult.TOP_RANK;
+import static com.android.settings.search2.SearchResult.BOTTOM_RANK;
 
 public class SearchResultsAdapter extends Adapter<SearchViewHolder> {
 
@@ -117,9 +118,9 @@
 
         int dbIndex = 0;
         int appIndex = 0;
-        int rank = 1;
+        int rank = TOP_RANK;
 
-        while (rank <= MAX_RANK) {
+        while (rank <= BOTTOM_RANK) {
             while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
                 results.add(databaseResults.get(dbIndex++));
             }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index d652efa..9405e8c 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -168,6 +168,9 @@
 
     private MenuItem mScanMenuItem;
 
+    // For Search
+    private static final String DATA_KEY_REFERENCE = "main_toggle_wifi";
+
     /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
@@ -1028,6 +1031,7 @@
                 data.title = res.getString(R.string.wifi_settings);
                 data.screenTitle = res.getString(R.string.wifi_settings);
                 data.keywords = res.getString(R.string.keywords_wifi);
+                data.key = DATA_KEY_REFERENCE;
                 result.add(data);
 
                 // Add saved Wi-Fi access points
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index 3fc034d..b448433 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -38,4 +38,6 @@
 
 LOCAL_TEST_PACKAGE := Settings
 
+LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
+
 include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file
diff --git a/tests/robotests/src/android/net/NetworkScorerAppData.java b/tests/robotests/src/android/net/NetworkScorerAppData.java
new file mode 100644
index 0000000..1eaa8a7
--- /dev/null
+++ b/tests/robotests/src/android/net/NetworkScorerAppData.java
@@ -0,0 +1,112 @@
+package android.net;
+
+import android.annotation.Nullable;
+import android.content.ComponentName;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Objects;
+
+/**
+ * Holds metadata about a discovered network scorer/recommendation application.
+ *
+ * TODO: delete this class once robolectric supports Android O
+ */
+public final class NetworkScorerAppData implements Parcelable {
+    /** UID of the scorer app. */
+    public final int packageUid;
+    private final ComponentName mRecommendationService;
+    /** User visible label in Settings for the recommendation service. */
+    private final String mRecommendationServiceLabel;
+    /**
+     * The {@link ComponentName} of the Activity to start before enabling the "connect to open
+     * wifi networks automatically" feature.
+     */
+    private final ComponentName mEnableUseOpenWifiActivity;
+
+    public NetworkScorerAppData(int packageUid, ComponentName recommendationServiceComp,
+            String recommendationServiceLabel, ComponentName enableUseOpenWifiActivity) {
+        this.packageUid = packageUid;
+        this.mRecommendationService = recommendationServiceComp;
+        this.mRecommendationServiceLabel = recommendationServiceLabel;
+        this.mEnableUseOpenWifiActivity = enableUseOpenWifiActivity;
+    }
+
+    protected NetworkScorerAppData(Parcel in) {
+        packageUid = in.readInt();
+        mRecommendationService = ComponentName.readFromParcel(in);
+        mRecommendationServiceLabel = in.readString();
+        mEnableUseOpenWifiActivity = ComponentName.readFromParcel(in);
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(packageUid);
+        ComponentName.writeToParcel(mRecommendationService, dest);
+        dest.writeString(mRecommendationServiceLabel);
+        ComponentName.writeToParcel(mEnableUseOpenWifiActivity, dest);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<NetworkScorerAppData> CREATOR =
+            new Creator<NetworkScorerAppData>() {
+                @Override
+                public NetworkScorerAppData createFromParcel(Parcel in) {
+                    return new NetworkScorerAppData(in);
+                }
+
+                @Override
+                public NetworkScorerAppData[] newArray(int size) {
+                    return new NetworkScorerAppData[size];
+                }
+            };
+
+    public String getRecommendationServicePackageName() {
+        return mRecommendationService.getPackageName();
+    }
+
+    public ComponentName getRecommendationServiceComponent() {
+        return mRecommendationService;
+    }
+
+    @Nullable
+    public ComponentName getEnableUseOpenWifiActivity() {
+        return mEnableUseOpenWifiActivity;
+    }
+
+    @Nullable
+    public String getRecommendationServiceLabel() {
+        return mRecommendationServiceLabel;
+    }
+
+    @Override
+    public String toString() {
+        return "NetworkScorerAppData{" +
+                "packageUid=" + packageUid +
+                ", mRecommendationService=" + mRecommendationService +
+                ", mRecommendationServiceLabel=" + mRecommendationServiceLabel +
+                ", mEnableUseOpenWifiActivity=" + mEnableUseOpenWifiActivity +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        NetworkScorerAppData that = (NetworkScorerAppData) o;
+        return packageUid == that.packageUid &&
+                Objects.equals(mRecommendationService, that.mRecommendationService) &&
+                Objects.equals(mRecommendationServiceLabel, that.mRecommendationServiceLabel) &&
+                Objects.equals(mEnableUseOpenWifiActivity, that.mEnableUseOpenWifiActivity);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(packageUid, mRecommendationService, mRecommendationServiceLabel,
+                mEnableUseOpenWifiActivity);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index 50f3ac6..033465b 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.support.v7.preference.PreferenceScreen;
@@ -127,11 +128,13 @@
         when(mFragment.getActivity()).thenReturn(activity);
 
         Account account = new Account("Account11", "com.acct1");
+        UserHandle userHandle = new UserHandle(10);
         RemoveAccountPreferenceController.ConfirmRemoveAccountDialog dialog =
-            RemoveAccountPreferenceController.ConfirmRemoveAccountDialog.show(mFragment, account);
-
+            RemoveAccountPreferenceController.ConfirmRemoveAccountDialog.show(
+                    mFragment, account, userHandle);
+        dialog.onCreate(new Bundle());
         dialog.onClick(null, 0);
         verify(mAccountManager).removeAccountAsUser(eq(account), any(Activity.class),
-            any(AccountManagerCallback.class), any(Handler.class), any(UserHandle.class));
+            any(AccountManagerCallback.class), any(Handler.class), eq(userHandle));
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
new file mode 100644
index 0000000..3076080
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.AppOpsManager;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppStateInstallAppsBridgeTest {
+
+    @Test
+    public void testInstallAppsStateCanInstallApps() {
+        AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
+                .InstallAppsState();
+        assertThat(appState.canInstallApps()).isFalse();
+
+        appState.permissionGranted = true;
+        appState.permissionRequested = true;
+        assertThat(appState.canInstallApps()).isTrue();
+
+        appState.appOpMode = AppOpsManager.MODE_ERRORED;
+        assertThat(appState.canInstallApps()).isFalse();
+    }
+
+    @Test
+    public void testInstallAppsStateIsPotentialAppSource() {
+        AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
+                .InstallAppsState();
+        assertThat(appState.isPotentialAppSource()).isFalse();
+
+        appState.appOpMode = AppOpsManager.MODE_ERRORED;
+        assertThat(appState.isPotentialAppSource()).isTrue();
+
+        appState.permissionRequested = true;
+        appState.appOpMode = AppOpsManager.MODE_DEFAULT;
+        assertThat(appState.isPotentialAppSource()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/ExternalSourcesDetailsTest.java
new file mode 100644
index 0000000..5b2f8e0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/ExternalSourcesDetailsTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.applications;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ExternalSourcesDetailsTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private AppStateInstallAppsBridge.InstallAppsState mInstallAppsStateAllowed;
+    @Mock
+    private AppStateInstallAppsBridge.InstallAppsState mInstallAppsStateBlocked;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mInstallAppsStateAllowed.canInstallApps()).thenReturn(true);
+        when(mInstallAppsStateBlocked.canInstallApps()).thenReturn(false);
+    }
+
+    @Test
+    public void testGetPreferenceSummary() {
+        ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.extraInfo = mInstallAppsStateBlocked;
+        ExternalSourcesDetails.getPreferenceSummary(mContext, appEntry);
+        verify(mContext).getString(R.string.external_source_untrusted);
+        appEntry.extraInfo = mInstallAppsStateAllowed;
+        ExternalSourcesDetails.getPreferenceSummary(mContext, appEntry);
+        verify(mContext).getString(R.string.external_source_trusted);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index 2a703ef..4fe6293 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,7 +16,14 @@
 
 package com.android.settings.applications;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import android.app.admin.DevicePolicyManager;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.os.UserManager;
@@ -25,6 +32,7 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,14 +40,10 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class InstalledAppDetailsTest {
@@ -117,4 +121,24 @@
         assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
     }
 
+    @Test
+    public void getStorageSummary_shouldWorkForExternal() {
+        Context context = RuntimeEnvironment.application.getApplicationContext();
+        AppStorageStats stats = mock(AppStorageStats.class);
+        when(stats.getTotalBytes()).thenReturn(1L);
+
+        assertThat(InstalledAppDetails.getStorageSummary(context, stats, true))
+                .isEqualTo("1.00B used in External storage");
+    }
+
+    @Test
+    public void getStorageSummary_shouldWorkForInternal() {
+        Context context = RuntimeEnvironment.application.getApplicationContext();
+        AppStorageStats stats = mock(AppStorageStats.class);
+        when(stats.getTotalBytes()).thenReturn(1L);
+
+        assertThat(InstalledAppDetails.getStorageSummary(context, stats, false))
+                .isEqualTo("1.00B used in Internal storage");
+
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index d6dab55..ae67b04 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -20,8 +20,6 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.Shadows.shadowOf;
 
@@ -29,16 +27,16 @@
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.app.backup.IBackupManager;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.IBinder;
+import android.os.UserHandle;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.SearchIndexableRaw;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,16 +47,20 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.util.ActivityController;
 import org.robolectric.shadows.ShadowActivity;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import java.util.List;
+
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class})
+        shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
+                BackupSettingsActivityTest.ShadowUserHandle.class})
 public class BackupSettingsActivityTest {
     private ActivityController<BackupSettingsActivity> mActivityController;
     private BackupSettingsActivity mActivity;
@@ -85,7 +87,6 @@
         mActivity = mActivityController.get();
         mPackageManager = (RobolectricPackageManager) mApplication.getPackageManager();
         doReturn(mComponent).when(mIntent).getComponent();
-
     }
 
     @Test
@@ -124,6 +125,41 @@
 
     }
 
+    @Test
+    public void getNonIndexableKeys_SystemUser() {
+        final List<SearchIndexableRaw> indexableRaws =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
+                        mApplication.getApplicationContext(), true);
+        final List<String> nonIndexableKeys =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                        mApplication.getApplicationContext());
+
+        assertThat(indexableRaws).isNotNull();
+        assertThat(indexableRaws).isNotEmpty();
+        assertThat(nonIndexableKeys).isEmpty();
+    }
+
+    @Test
+    public void getNonIndexableKeys_NonSystemUser() {
+        ShadowUserHandle.setUid(1); // Non-SYSTEM user.
+
+        final List<SearchIndexableRaw> indexableRaws =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
+                        mApplication.getApplicationContext(), true);
+        final List<String> nonIndexableKeys =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                        mApplication.getApplicationContext());
+
+        assertThat(indexableRaws).isNotNull();
+        assertThat(indexableRaws).isNotEmpty();
+        assertThat(nonIndexableKeys).isNotEmpty();
+    }
+
+    @After
+    public void resetShadows() {
+        ShadowUserHandle.reset();
+    }
+
     @Implements(BackupSettingsHelper.class)
     public static class ShadowBackupSettingsHelper {
         @Implementation
@@ -136,4 +172,23 @@
             return mIsBackupProvidedByOEM;
         }
     }
+
+    @Implements(UserHandle.class)
+    public static class ShadowUserHandle {
+        private static int sUid = 0; // SYSTEM by default
+
+        public static void setUid(int uid) {
+            sUid = uid;
+        }
+
+        @Implementation
+        public static int myUserId() {
+            return sUid;
+        }
+
+        @Resetter
+        public static void reset() {
+            sUid = 0;
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
index eeaa175..763d6e3 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Pair;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -32,7 +33,6 @@
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -71,7 +71,8 @@
         editor.putInt(TEST_KEY, 2);
         editor.putInt(TEST_KEY, 2);
 
-        verify(mMetricsFeature, times(6)).count(any(Context.class), anyString(), anyInt());
+        verify(mMetricsFeature, times(6)).action(any(Context.class), anyInt(),
+                any(Pair.class), any(Pair.class));
     }
 
     @Test
@@ -83,7 +84,8 @@
         editor.putBoolean(TEST_KEY, false);
         editor.putBoolean(TEST_KEY, false);
 
-        verify(mMetricsFeature, times(4)).count(any(Context.class), anyString(), anyInt());
+        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
+                any(Pair.class), any(Pair.class));
     }
 
     @Test
@@ -95,7 +97,8 @@
         editor.putLong(TEST_KEY, 1);
         editor.putLong(TEST_KEY, 2);
 
-        verify(mMetricsFeature, times(4)).count(any(Context.class), anyString(), anyInt());
+        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
+                any(Pair.class), any(Pair.class));
     }
 
     @Test
@@ -107,7 +110,8 @@
         editor.putFloat(TEST_KEY, 1);
         editor.putFloat(TEST_KEY, 2);
 
-        verify(mMetricsFeature, times(4)).count(any(Context.class), anyString(), anyInt());
+        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
+                any(Pair.class), any(Pair.class));
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index e985179..b1144f0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -18,9 +18,11 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.TypedArray;
+import android.content.res.Resources;
 import android.view.View;
+import android.widget.FrameLayout;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -35,12 +37,16 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import org.mockito.Matchers;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -48,8 +54,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DashboardAdapterTest {
-    @Mock
-    private Context mContext;
+
     @Mock
     private View mView;
     @Mock
@@ -57,18 +62,29 @@
     @Mock
     private MetricsFeatureProvider mMetricsFeatureProvider;
     @Mock
-    private TypedArray mTypedArray;
+    private Resources mResources;
+    @Mock
+    private DashboardData mDashboardData;
     @Captor
     private ArgumentCaptor<Integer> mActionCategoryCaptor = ArgumentCaptor.forClass(Integer.class);
     @Captor
     private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
     private DashboardAdapter mDashboardAdapter;
+    private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
+    private DashboardData.SuggestionHeaderData mSuggestionHeaderData;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mDashboardAdapter = new DashboardAdapter(mContext, null, mMetricsFeatureProvider,
+        Context context = RuntimeEnvironment.application;
+        context = spy(context);
+        when(context.getResources()).thenReturn(mResources);
+        when(mResources
+                .getQuantityString(any(int.class), any(int.class), Matchers.<Object>anyVararg()))
+                .thenReturn("");
+        mDashboardAdapter = new DashboardAdapter(context, null, mMetricsFeatureProvider,
                 null, null);
+        mSuggestionHeaderData = new DashboardData.SuggestionHeaderData(true, 1, 0);
         when(mView.getTag()).thenReturn(mCondition);
     }
 
@@ -81,20 +97,29 @@
     }
 
     @Test
-    public void testSuggestionsLogs() {
-        when(mTypedArray.getColor(any(int.class), any(int.class))).thenReturn(0);
-        when(mContext.obtainStyledAttributes(any(int[].class))).thenReturn(mTypedArray);
-        List<Tile> suggestions = new ArrayList<Tile>();
-        suggestions.add(makeSuggestion("pkg1", "cls1"));
-        suggestions.add(makeSuggestion("pkg2", "cls2"));
-        suggestions.add(makeSuggestion("pkg3", "cls3"));
-        mDashboardAdapter.setCategoriesAndSuggestions(
-                new ArrayList<DashboardCategory>(), suggestions);
+    public void testSuggestionsLogs_NotExpanded() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        verify(mMetricsFeatureProvider, times(2)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_NotExpandedAndPaused() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onPause();
         verify(mMetricsFeatureProvider, times(4)).action(
-             any(Context.class), mActionCategoryCaptor.capture(), mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[] {"pkg1", "pkg2", "pkg1", "pkg2"};
-        Integer[] expectedActions = new Integer[] {
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg1", "pkg2"};
+        Integer[] expectedActions = new Integer[]{
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
@@ -103,6 +128,188 @@
         assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
     }
 
+    @Test
+    public void testSuggestionsLogs_Expanded() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(3)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedAndPaused() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(6)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedAfterPause() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(7)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{
+                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(10)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{
+                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(1)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(2)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(3)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg1", "pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(4)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg1", "pkg1", "pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    private List<Tile> makeSuggestions(String[] pkgNames) {
+        List<Tile> suggestions = new ArrayList<Tile>();
+        for (String pkgName : pkgNames) {
+            suggestions.add(makeSuggestion(pkgName, "cls"));
+        }
+        return suggestions;
+    }
+
     private Tile makeSuggestion(String pkgName, String className) {
         Tile suggestion = new Tile();
         suggestion.intent = new Intent("action");
@@ -110,4 +317,12 @@
         return suggestion;
     }
 
+    private void setUpSuggestions(List<Tile> suggestions) {
+        mDashboardAdapter.setCategoriesAndSuggestions(
+                new ArrayList<DashboardCategory>(), suggestions);
+        mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
+                new FrameLayout(RuntimeEnvironment.application),
+                mDashboardAdapter.getItemViewType(0));
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
new file mode 100644
index 0000000..8da2a9c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.settings.deviceinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.util.SparseArray;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
+import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
+import com.android.settingslib.applications.StorageStatsSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class StorageProfileFragmentTest {
+    @Test
+    public void verifyAppSizesAreZeroedOut() {
+        StorageItemPreferenceController controller = mock(StorageItemPreferenceController.class);
+        StorageProfileFragment fragment = new StorageProfileFragment();
+        StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
+        result.musicAppsSize = 100;
+        result.otherAppsSize = 200;
+        result.gamesSize = 300;
+        result.externalStats = new StorageStatsSource.ExternalStorageStats(6, 1, 2, 3);
+        SparseArray<StorageAsyncLoader.AppsStorageResult> resultsArray = new SparseArray<>();
+        resultsArray.put(0, result);
+        fragment.setPreferenceController(controller);
+
+        fragment.onLoadFinished(null, resultsArray);
+
+        ArgumentCaptor<StorageAsyncLoader.AppsStorageResult> resultCaptor = ArgumentCaptor.forClass(
+                StorageAsyncLoader.AppsStorageResult.class);
+        verify(controller).onLoadFinished(resultCaptor.capture());
+
+        StorageAsyncLoader.AppsStorageResult extractedResult = resultCaptor.getValue();
+        assertThat(extractedResult.musicAppsSize).isEqualTo(0);
+        assertThat(extractedResult.otherAppsSize).isEqualTo(0);
+        assertThat(extractedResult.gamesSize).isEqualTo(0);
+        assertThat(extractedResult.externalStats.audioBytes).isEqualTo(1);
+        assertThat(extractedResult.externalStats.videoBytes).isEqualTo(2);
+        assertThat(extractedResult.externalStats.imageBytes).isEqualTo(3);
+        assertThat(extractedResult.externalStats.totalBytes).isEqualTo(6);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 9b955e4..da9569e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -18,12 +18,14 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.net.ProxyInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 
 import com.android.settings.R;
@@ -46,6 +48,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
 /**
@@ -61,11 +64,16 @@
     private final int MY_USER_ID = UserHandle.myUserId();
     private final int MANAGED_PROFILE_USER_ID = MY_USER_ID + 1;
     private final String VPN_PACKAGE_ID = "com.example.vpn";
+    private final String IME_PACKAGE_ID = "com.example.ime";
+    private final String OTHER_PACKAGE_ID = "com.example.other";
+    private final String IME_PACKAGE_LABEL = "Test IME";
 
     private List<UserInfo> mProfiles = new ArrayList();
 
+    private @Mock Context mContext;
     private @Mock DevicePolicyManagerWrapper mDevicePolicyManager;
-    private @Mock PackageManagerWrapper mPackageManager;
+    private @Mock PackageManagerWrapper mPackageManagerWrapper;
+    private @Mock PackageManager mPackageManager;
     private @Mock UserManager mUserManager;
     private @Mock ConnectivityManagerWrapper mConnectivityManger;
     private Resources mResources;
@@ -76,14 +84,14 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))
-                .thenReturn(true);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        resetAndInitializePackageManagerWrapper();
         when(mUserManager.getProfiles(MY_USER_ID)).thenReturn(mProfiles);
         mProfiles.add(new UserInfo(MY_USER_ID, "", "", 0 /* flags */));
         mResources = ShadowApplication.getInstance().getApplicationContext().getResources();
 
-        mProvider = new EnterprisePrivacyFeatureProviderImpl(mDevicePolicyManager, mPackageManager,
-                mUserManager, mConnectivityManger, mResources);
+        mProvider = new EnterprisePrivacyFeatureProviderImpl(mContext, mDevicePolicyManager,
+                mPackageManagerWrapper, mUserManager, mConnectivityManger, mResources);
     }
 
     @Test
@@ -106,28 +114,26 @@
 
     @Test
     public void testGetDeviceOwnerDisclosure() {
-        final Context context = mock(Context.class);
-
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        assertThat(mProvider.getDeviceOwnerDisclosure(context)).isNull();
+        assertThat(mProvider.getDeviceOwnerDisclosure()).isNull();
 
         SpannableStringBuilder disclosure = new SpannableStringBuilder();
         disclosure.append(mResources.getString(R.string.do_disclosure_generic));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
-                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(context), 0);
+                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
         when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
-        assertThat(mProvider.getDeviceOwnerDisclosure(context)).isEqualTo(disclosure);
+        assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
 
         disclosure = new SpannableStringBuilder();
         disclosure.append(mResources.getString(R.string.do_disclosure_with_name,
                 OWNER_ORGANIZATION));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
-                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(context), 0);
+                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
         when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION);
-        assertThat(mProvider.getDeviceOwnerDisclosure(context)).isEqualTo(disclosure);
+        assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
     }
 
     @Test
@@ -217,4 +223,43 @@
         mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(10);
     }
+
+    @Test
+    public void testGetImeLabelIfOwnerSet() throws Exception {
+        final ApplicationInfo applicationInfo = mock(ApplicationInfo.class);
+        when(applicationInfo.loadLabel(mPackageManager)).thenReturn(IME_PACKAGE_LABEL);
+
+        Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
+        when(mPackageManagerWrapper.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+                .thenReturn(applicationInfo);
+
+        // IME not set by Device Owner.
+        when(mDevicePolicyManager.isCurrentInputMethodSetByOwner()).thenReturn(false);
+        assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
+
+        // Device Owner set IME to empty string.
+        when(mDevicePolicyManager.isCurrentInputMethodSetByOwner()).thenReturn(true);
+        Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, null);
+        assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
+
+        // Device Owner set IME to nonexistent package.
+        Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
+        when(mPackageManagerWrapper.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+                .thenThrow(new PackageManager.NameNotFoundException());
+        assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
+
+        // Device Owner set IME to existent package.
+        resetAndInitializePackageManagerWrapper();
+        when(mPackageManagerWrapper.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+                .thenReturn(applicationInfo);
+        assertThat(mProvider.getImeLabelIfOwnerSet()).isEqualTo(IME_PACKAGE_LABEL);
+    }
+
+    private void resetAndInitializePackageManagerWrapper() {
+        reset(mPackageManagerWrapper);
+        when(mPackageManagerWrapper.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))
+                .thenReturn(true);
+        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
+
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 6c062ae..f74c63a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -73,7 +73,7 @@
         final List<PreferenceController> controllers = mSettings.getPreferenceControllers(
                 ShadowApplication.getInstance().getApplicationContext());
         assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(14);
+        assertThat(controllers.size()).isEqualTo(15);
         assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class);
         assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class);
         assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class);
@@ -95,5 +95,6 @@
         assertThat(controllers.get(11)).isInstanceOf(GlobalHttpProxyPreferenceController.class);
         assertThat(controllers.get(12)).isInstanceOf(FailedPasswordWipePrimaryUserPreferenceController.class);
         assertThat(controllers.get(13)).isInstanceOf(FailedPasswordWipeManagedProfilePreferenceController.class);
+        assertThat(controllers.get(14)).isInstanceOf(ImePreferenceController.class);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
new file mode 100644
index 0000000..232a872
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.content.res.Resources;
+import com.android.settings.R;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link ImePreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class ImePreferenceControllerTest {
+
+    private final String DEFAULT_IME_LABEL = "Test IME";
+    private final String DEFAULT_IME_TEXT = "IME set to Test IME";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+
+    private ImePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mController = new ImePreferenceController(mContext);
+        when(mContext.getResources().getString(R.string.enterprise_privacy_input_method,
+                DEFAULT_IME_LABEL)).thenReturn(DEFAULT_IME_TEXT);
+    }
+
+    @Test
+    public void testUpdateState() {
+        final Preference preference = new Preference(mContext, null, 0, 0);
+        preference.setVisible(true);
+
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
+            .thenReturn(null);
+        mController.updateState(preference);
+        assertThat(preference.isVisible()).isFalse();
+
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
+            .thenReturn(DEFAULT_IME_LABEL);
+        mController.updateState(preference);
+        assertThat(preference.isVisible()).isTrue();
+        assertThat(preference.getTitle()).isEqualTo(DEFAULT_IME_TEXT);
+    }
+
+    @Test
+    public void testIsAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick() {
+        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
+                .isFalse();
+    }
+
+    @Test
+    public void testGetPreferenceKey() {
+        assertThat(mController.getPreferenceKey()).isEqualTo("input_method");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index ed7e48b..494ac67 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -94,9 +94,9 @@
     @Test
     public void testExtractUsageType_TypeEqualsToDrainType_ReturnRelevantType() {
         final DrainType drainTypes[] = {DrainType.WIFI, DrainType.BLUETOOTH, DrainType.IDLE,
-                DrainType.USER, DrainType.CELL};
+                DrainType.USER, DrainType.CELL, DrainType.UNACCOUNTED};
         final int usageTypes[] = {UsageType.WIFI, UsageType.BLUETOOTH, UsageType.IDLE,
-                UsageType.USER, UsageType.CELL};
+                UsageType.USER, UsageType.CELL, UsageType.UNACCOUNTED};
 
         assertThat(drainTypes.length).isEqualTo(usageTypes.length);
         for (int i = 0, size = drainTypes.length; i < size; i++) {
@@ -147,7 +147,7 @@
 
         assertThat(usageTypeSet).asList().containsExactly(UsageType.APP, UsageType.WIFI,
                 UsageType.CELL, UsageType.BLUETOOTH, UsageType.IDLE, UsageType.SERVICE,
-                UsageType.USER, UsageType.SYSTEM);
+                UsageType.USER, UsageType.SYSTEM, UsageType.UNACCOUNTED);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
new file mode 100644
index 0000000..fef6f85
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.NetworkScorerAppData;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.widget.RadioButtonPreference;
+import com.google.android.collect.Lists;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class NetworkScorerPickerTest {
+
+    private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1";
+    private static final String TEST_SCORER_CLASS_1 = "Test Class 1";
+    private static final String TEST_SCORER_LABEL_1 = "Test Label 1";
+    private static final String TEST_SCORER_PACKAGE_2 = "Test Package 2";
+
+    private Context mContext;
+    @Mock
+    private NetworkScoreManagerWrapper mNetworkScoreManager;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mFragment = new TestFragment(mContext, mPreferenceScreen, mNetworkScoreManager);
+        mFragment.onAttach(mContext);
+    }
+
+    @Test
+    public void testOnRadioButtonClicked_success() {
+        RadioButtonPreference pref = new RadioButtonPreference(mContext);
+        pref.setKey(TEST_SCORER_PACKAGE_1);
+        when(mPreferenceScreen.getPreference(anyInt())).thenReturn(pref);
+        when(mPreferenceScreen.getPreferenceCount()).thenReturn(1);
+        when(mNetworkScoreManager.setActiveScorer(TEST_SCORER_PACKAGE_1)).thenReturn(true);
+        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_2);
+
+        mFragment.onRadioButtonClicked(pref);
+
+        verify(mNetworkScoreManager).setActiveScorer(TEST_SCORER_PACKAGE_1);
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    @Test
+    public void testOnRadioButtonClicked_currentScorer_doNothing() {
+        RadioButtonPreference pref = new RadioButtonPreference(mContext);
+        pref.setKey(TEST_SCORER_PACKAGE_1);
+        pref.setChecked(true);
+        when(mPreferenceScreen.getPreference(anyInt())).thenReturn(pref);
+        when(mPreferenceScreen.getPreferenceCount()).thenReturn(1);
+        when(mNetworkScoreManager.setActiveScorer(TEST_SCORER_PACKAGE_1)).thenReturn(true);
+        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_1);
+
+        mFragment.onRadioButtonClicked(pref);
+
+        verify(mNetworkScoreManager, never()).setActiveScorer(any());
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    @Test
+    public void testUpdateCandidates_noValidScorers_nonePreference() {
+        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(new ArrayList<>());
+        ArgumentCaptor<RadioButtonPreference> arg =
+                ArgumentCaptor.forClass(RadioButtonPreference.class);
+
+        mFragment.updateCandidates();
+
+        verify(mPreferenceScreen).addPreference(arg.capture());
+        assertThat(arg.getValue().getTitle()).isEqualTo(
+                mContext.getString(R.string.network_scorer_picker_none_preference));
+    }
+
+    @Test
+    public void testUpdateCandidates_validScorer() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE_1, TEST_SCORER_CLASS_1);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL_1, null /* enableUseOpenWifiActivity */);
+        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(
+                Lists.newArrayList(scorerAppData));
+        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_1);
+        ArgumentCaptor<RadioButtonPreference> arg =
+                ArgumentCaptor.forClass(RadioButtonPreference.class);
+
+        mFragment.updateCandidates();
+
+        verify(mPreferenceScreen).addPreference(arg.capture());
+        RadioButtonPreference pref = arg.getValue();
+        assertThat(pref.getTitle()).isEqualTo(TEST_SCORER_LABEL_1);
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    public static class TestFragment extends NetworkScorerPicker {
+
+        private final Context mContext;
+        private final PreferenceScreen mScreen;
+        private final PreferenceManager mPrefManager;
+        private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
+
+        public TestFragment(Context context, PreferenceScreen preferenceScreen,
+                NetworkScoreManagerWrapper networkScoreManagerWrapper) {
+            mContext = context;
+            mScreen = preferenceScreen;
+            mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
+            mPrefManager = mock(PreferenceManager.class);
+            when(mPrefManager.getContext()).thenReturn(context);
+        }
+
+        @Override
+        public Context getContext() {
+            return mContext;
+        }
+
+        @Override
+        public PreferenceManager getPreferenceManager() {
+            return mPrefManager;
+        }
+
+        @Override
+        public PreferenceScreen getPreferenceScreen() {
+            return mScreen;
+        }
+
+        @Override
+        NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
+            return mNetworkScoreManagerWrapper;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index a856e8c..6f751eb 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -18,9 +18,10 @@
 
 
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -35,6 +36,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -65,6 +69,18 @@
     }
 
     @Test
+    public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
+        final BluetoothPan pan = mock(BluetoothPan.class);
+        final AtomicReference<BluetoothPan> panRef =
+                ReflectionHelpers.getField(mController, "mBluetoothPan");
+        panRef.set(pan);
+
+        mController.onDestroy();
+
+        verify(mBluetoothAdapter).closeProfileProxy(BluetoothProfile.PAN, pan);
+    }
+
+    @Test
     public void updateSummary_noPreference_noInteractionWithConnectivityManager() {
         mController.updateSummary();
         verifyNoMoreInteractions(mConnectivityManager);
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
new file mode 100644
index 0000000..7e898fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.nfc;
+
+import android.content.Context;
+
+import android.content.pm.PackageManager;
+import android.content.pm.PackageParser;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PaymentSettingsTest {
+    @Mock
+    Context mContext;
+
+    @Mock
+    private PackageManager mManager;
+
+    private PaymentSettings mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFragment = new PaymentSettings();
+        when(mContext.getPackageManager()).thenReturn(mManager);
+    }
+
+    @Test
+    public void testNonIndexableKey_NoNFC_KeyAdded() {
+        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
+
+        List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        assertThat(niks).contains(mFragment.PAYMENT_KEY);
+    }
+
+    @Test
+    public void testNonIndexableKey_NFC_NoKeyAdded() {
+        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
+
+        List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        assertThat(niks).isNull();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
index 6f326ab..ab55605 100644
--- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
@@ -24,6 +24,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.ArrayMap;
 
+import com.android.settings.DisplaySettings;
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
@@ -32,6 +33,7 @@
 import com.android.settings.gestures.SwipeToNotificationSettings;
 import com.android.settings.search2.ResultPayload.PayloadType;
 
+import com.android.settings.wifi.WifiSettings;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -147,6 +149,29 @@
     }
 
     @Test
+    public void testLongTitle_PenalizedInRank() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                "Longer than 20 characters", // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                DisplaySettings.class.getName(),
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                BLANK,   // Key
+                0,       // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+        assertThat(results.get(0).rank).isEqualTo(BASE_RANK + 2);
+    }
+
+    @Test
     public void testParseCursor_MatchesIntentForSubSettings() {
         MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
         final String BLANK = "";
@@ -246,6 +271,245 @@
         assertThat(newPayload.valueMap.get(0)).isFalse();
     }
 
+    // The following tests are temporary, and should be removed when we replace the Search
+    // White-list solution for elevating ranking.
+
+    @Test
+    public void testWifiKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "main_toggle_wifi";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testBluetoothKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "main_toggle_bluetooth";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testAirplaneKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "toggle_airplane";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testHotspotKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "tether_settings";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testBatterySaverKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "battery_saver";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testNFCKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "toggle_nfc";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testDataSaverKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "restrict_background";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testDataUsageKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "data_usage_enable";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    @Test
+    public void testRoamingKey_PrioritizedResult() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String key = "button_roaming_key";
+
+        cursor.addRow(new Object[]{
+                ID,      // Doc ID
+                TITLES[0], // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                WifiSettings.class.getName(),   // ClassName
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                key,     // Key
+                0,   // Payload Type
+                null     // Payload
+        });
+        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+
+        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
+    }
+
+    // End of temporary tests
+
     private MatrixCursor getDummyCursor() {
         return getDummyCursor(true /* hasIcon */);
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index 181ae64..113c7aa 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -10,6 +10,9 @@
 import android.support.annotation.ArrayRes;
 import android.util.AttributeSet;
 import android.util.TypedValue;
+
+import com.android.settings.R;
+
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -36,7 +39,8 @@
 @Implements(Resources.class)
 public class SettingsShadowResources extends ShadowResources {
 
-    @RealObject public Resources realResources;
+    @RealObject
+    public Resources realResources;
 
     @Implementation
     public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException {
@@ -54,12 +58,14 @@
         // The drawable item in switchbar_background.xml refers to a very recent color attribute
         // that Robolectric isn't yet aware of.
         // TODO: Remove this once Robolectric is updated.
-        if (id == com.android.settings.R.drawable.switchbar_background) {
+        if (id == R.drawable.switchbar_background) {
             return new ColorDrawable();
-        } else if (id == com.android.settings.R.drawable.ic_launcher_settings) {
+        } else if (id == R.drawable.ic_launcher_settings) {
             // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
             // change it to a normal drawable.
-            id = com.android.settings.R.drawable.ic_settings_wireless;
+            id = R.drawable.ic_settings_wireless;
+        } else if (id == R.drawable.app_filter_spinner_background) {
+            id = R.drawable.ic_expand_more_inverse;
         }
         return super.loadDrawable(value, id, theme);
     }