Merge "Sync search result loaders"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 066561c..e9f39a5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1980,8 +1980,9 @@
         <activity android:name=".AppPicker" android:label="@string/select_application"
                 android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
 
-        <activity android:name=".webview.WebViewAppPicker" android:label="@string/select_webview_provider_dialog_title"
-                android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
+        <activity android:name="Settings$WebViewAppPickerActivity"
+                  android:label="@string/select_webview_provider_dialog_title">
+        </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UsbSettings"
@@ -2003,18 +2004,6 @@
             </intent-filter>
         </activity>
 
-        <receiver
-            android:name=".bluetooth.DockEventReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.DOCK_EVENT" />
-                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
-                <action android:name="android.bluetooth.headset.action.STATE_CHANGED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name=".bluetooth.DockService" />
-
         <activity android:name=".bluetooth.RequestPermissionActivity"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
@@ -2130,6 +2119,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="6">
+                <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.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wfd.WifiDisplaySettings" />
         </activity>
@@ -2940,7 +2934,7 @@
 
         <!-- Keep compatibility with old WebView-picker implementation -->
         <activity-alias android:name=".WebViewImplementation"
-                  android:targetActivity=".webview.WebViewAppPicker"
+                  android:targetActivity="Settings$WebViewAppPickerActivity"
                   android:exported="true"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
@@ -2950,6 +2944,8 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.webview.WebViewAppPicker" />
       </activity-alias>
 
         <!-- activity for gesture settings -->
@@ -3022,6 +3018,8 @@
                        android:value="com.android.settings.category.ia.homepage"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.network.NetworkDashboardFragment"/>
+            <meta-data android:name="com.android.settings.summary"
+                       android:value="@string/network_dashboard_summary"/>
         </activity>
 
         <activity-alias android:name="DataUsageDashboardAlias"
@@ -3045,6 +3043,8 @@
                        android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
+            <meta-data android:name="com.android.settings.summary"
+                       android:value="@string/connected_devices_dashboard_summary"/>
         </activity>
 
         <activity android:name=".Settings$AppAndNotificationDashboardActivity"
@@ -3057,6 +3057,8 @@
                        android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
+            <meta-data android:name="com.android.settings.summary"
+                       android:value="@string/app_and_notification_dashboard_summary"/>
         </activity>
 
         <activity-alias android:name="BatteryDashboardAlias"
@@ -3081,6 +3083,8 @@
                        android:value="com.android.settings.DisplaySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:value="@string/display_dashboard_summary"/>
         </activity-alias>
 
         <activity-alias android:name="SoundDashboardAlias"
@@ -3094,6 +3098,8 @@
                        android:value="com.android.settings.notification.SoundSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:value="@string/sound_dashboard_summary"/>
         </activity-alias>
 
         <activity android:name=".Settings$StorageDashboardActivity"
@@ -3159,6 +3165,8 @@
                        android:value="com.android.settings.accessibility.AccessibilitySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/accessibility_settings_summary" />
         </activity-alias>
 
         <activity android:name=".Settings$SystemDashboardActivity"
@@ -3171,6 +3179,8 @@
                        android:value="com.android.settings.category.ia.homepage"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.system.SystemDashboardFragment"/>
+            <meta-data android:name="com.android.settings.summary"
+                       android:value="@string/system_dashboard_summary"/>
         </activity>
 
         <activity android:name=".Settings$SupportDashboardActivity"
@@ -3184,7 +3194,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.dashboard.SupportFragment"/>
             <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/help_label"/>
+                       android:resource="@string/support_summary"/>
         </activity>
 
         <!-- Alias for IME & Language in new IA. Should merge into TargetActivity when launch -->
@@ -3270,17 +3280,6 @@
                        android:value="com.android.settings.applications.ProcessStatsSummary" />
         </activity-alias>
 
-        <activity-alias android:name="CastDashboardAlias"
-                        android:targetActivity="Settings$WifiDisplaySettingsActivity">
-            <intent-filter android:priority="6">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.wfd.WifiDisplaySettings" />
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.device" />
-        </activity-alias>
-
         <activity-alias android:name="PrintDashboardAlias"
                         android:targetActivity="Settings$PrintSettingsActivity">
             <intent-filter android:priority="2">
@@ -3426,11 +3425,41 @@
 
         <!-- Quick Settings tiles for Developer Options -->
         <service
-            android:name=".qstile.DevelopmentModeTile"
-            android:label="@string/developer_tile"
-            android:icon="@drawable/ic_settings_development"
+            android:name=".qstile.DevelopmentTiles$ShowLayout"
+            android:label="@string/debug_layout"
+            android:icon="@drawable/tile_icon_show_layout"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:enabled="true">
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".qstile.DevelopmentTiles$GPUProfiling"
+            android:label="@string/track_frame_time"
+            android:icon="@drawable/tile_icon_graphics"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".qstile.DevelopmentTiles$ForceRTL"
+            android:label="@string/force_rtl_layout_all_locales"
+            android:icon="@drawable/tile_icon_force_rtl"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".qstile.DevelopmentTiles$AnimationSpeed"
+            android:label="@string/window_animation_scale_title"
+            android:icon="@drawable/tile_icon_animation_speed"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -3439,11 +3468,7 @@
             android:name=".qstile.DevelopmentTileConfigActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
-            android:label="@string/developer_tile">
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
-            </intent-filter>
-        </activity>
+            android:label="@string/quick_settings_developer_tiles" />
 
         <activity android:name=".HelpTrampoline"
             android:exported="true"
diff --git a/res/drawable/ic_battery_circle.xml b/res/drawable/ic_battery_circle.xml
new file mode 100644
index 0000000..5c736fd
--- /dev/null
+++ b/res/drawable/ic_battery_circle.xml
@@ -0,0 +1,24 @@
+<!--
+     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/colorControlNormal">
+    <path android:fillColor="#FF000000"
+          android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/tile_icon_animation_speed.xml b/res/drawable/tile_icon_animation_speed.xml
new file mode 100644
index 0000000..4a7c708
--- /dev/null
+++ b/res/drawable/tile_icon_animation_speed.xml
@@ -0,0 +1,25 @@
+<!--
+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/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4,2C2.89,2 2,2.89 2,4V14H4V4H14V2H4M8,6C6.89,6 6,6.89 6,8V18H8V8H18V6H8M12,10C10.89,10 10,10.89 10,12V20C10,21.11 10.89,22 12,22H20C21.11,22 22,21.11 22,20V12C22,10.89 21.11,10 20,10H12Z" />
+</vector>
diff --git a/res/drawable/tile_icon_force_rtl.xml b/res/drawable/tile_icon_force_rtl.xml
new file mode 100644
index 0000000..e87bdde
--- /dev/null
+++ b/res/drawable/tile_icon_force_rtl.xml
@@ -0,0 +1,61 @@
+<!--
+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/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,12L12,7V10H16V14H12V17L7,12" />
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M0.0,6.0h1.0v12.0h-1.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M6.0,0.0h12.0v1.0h-12.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M23.0,6.0h1.0v12.0h-1.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M6.0,23.0h12.0v1.0h-12.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M9.5,4h5.0v1.0h-5.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M9.5,19h5.0v1.0h-5.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4.5,5.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,10.0l0.0,6.0l6.0,0.0l0.0,-1.0l-5.0,0.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14.5,4.0l0.0,1.0l5.0,0.0l0.0,14l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-16z"/>
+</vector>
diff --git a/res/drawable/tile_icon_graphics.xml b/res/drawable/tile_icon_graphics.xml
new file mode 100644
index 0000000..af611ac
--- /dev/null
+++ b/res/drawable/tile_icon_graphics.xml
@@ -0,0 +1,53 @@
+<!--
+Copyright (C) 2015 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/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M23,1v22H1V1H23 M24,0H0v24h24V0L24,0z"/>
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.667"
+        android:pathData="M5,19L1,23"/>
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.667"
+        android:pathData="M1,1L5,5"/>
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.667"
+        android:pathData="M19,5L23,1"/>
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.667"
+        android:pathData="M19,19L23,23"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14,3.8l-4,0l-0.2,-0.8l4.4,0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18.8,5.2v13.5H5.2V5.2H18.8 M19.5,4.5h-15v15h15V4.5L19.5,4.5z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6.5,9.5h5v11h-5z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12.5,16.5h5v5h-5z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/tile_icon_show_layout.xml b/res/drawable/tile_icon_show_layout.xml
new file mode 100644
index 0000000..e23b24c
--- /dev/null
+++ b/res/drawable/tile_icon_show_layout.xml
@@ -0,0 +1,61 @@
+<!--
+Copyright (C) 2015 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/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,7.2c-3.2,0 -5.9,2 -7,4.8c1.1,2.8 3.8,4.8 7,4.8s5.9,-2 7,-4.8C17.9,9.2 15.2,7.2 12,7.2zM12,15.2c-1.8,0 -3.2,-1.4 -3.2,-3.2s1.4,-3.2 3.2,-3.2s3.2,1.4 3.2,3.2S13.8,15.2 12,15.2zM12,10.1c-1.1,0 -1.9,0.9 -1.9,1.9s0.9,1.9 1.9,1.9s1.9,-0.9 1.9,-1.9S13.1,10.1 12,10.1z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M0.0,6.0h1.0v12.0h-1.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M6.0,0.0h12.0v1.0h-12.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M23.0,6.0h1.0v12.0h-1.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M6.0,23.0h12.0v1.0h-12.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M9.5,6.0h5.0v1.0h-5.0z"/>
+    <path
+        android:fillColor="#80FFFFFF"
+        android:pathData="M9.5,17.0h5.0v1.0h-5.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4.5,7.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l0.0,6.0l6.0,0.0l0.0,-1.0l-5.0,0.0l0.0,-5.0z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14.5,6.0l0.0,1.0l5.0,0.0l0.0,5.0l0.0,5.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l0.0,-6.0z"/>
+</vector>
\ No newline at end of file
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 7994a4c..3088865 100644
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -24,36 +24,91 @@
     android:layout_gravity="center_horizontal|top"
     android:orientation="vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp" >
 
     <!-- App snippet with buttons -->
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:scaleType="fitXY"
-        android:layout_gravity="center_horizontal"
-        android:antialias="true"/>
-
-    <TextView
-        android:id="@android:id/title"
-        style="@style/TextAppearance.EntityHeaderTitle"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center_horizontal"
-        android:paddingTop="8dp"/>
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:scaleType="fitXY"
+            android:layout_gravity="center_horizontal"
+            android:antialias="true"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@android:id/title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:gravity="start"
+                android:paddingTop="8dp"/>
+
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
 
     <TextView
-        android:id="@android:id/summary"
+        android:id="@+id/instant_app_developer_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="?android:attr/textColorSecondary"/>
+        android:visibility="gone"/>
+
+    <LinearLayout
+        android:id="@+id/instant_app_maturity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/instant_app_maturity_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:scaleType="fitXY"/>
+        <TextView
+            android:id="@+id/instant_app_maturity_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/instant_app_monetization"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:visibility="gone"/>
+
 
     <LinearLayout
         android:id="@+id/app_detail_links"
diff --git a/res/layout/development_tile_config_header.xml b/res/layout/development_tile_config_header.xml
deleted file mode 100644
index 5169da2..0000000
--- a/res/layout/development_tile_config_header.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
-    android:background="@drawable/switchbar_background"
-    android:text="@string/developer_tile_unavailable"
-    android:paddingStart="8dip"
-    android:paddingEnd="8dip"
-    android:singleLine="true"
-    android:ellipsize="marquee"
-    android:marqueeRepeatLimit ="marquee_forever"
-    android:textSize="16sp"
-    android:fontFamily="sans-serif"
-    android:textColor="?android:attr/textColorPrimary"
-    android:gravity="center" />
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index e9ce9b5..de53ce2 100644
--- a/res/layout/preference_category_material_settings.xml
+++ b/res/layout/preference_category_material_settings.xml
@@ -21,9 +21,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp">
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
 
     <LinearLayout
         android:id="@+id/icon_container"
@@ -47,6 +47,7 @@
         android:orientation="vertical">
         <TextView
             android:id="@android:id/title"
+            android:layout_marginTop="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="@android:style/TextAppearance.Material.Body2"
diff --git a/res/layout/preference_master_switch.xml b/res/layout/preference_master_switch.xml
new file mode 100644
index 0000000..9f46d76
--- /dev/null
+++ b/res/layout/preference_master_switch.xml
@@ -0,0 +1,90 @@
+<?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.
+-->
+
+<!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="@android:color/transparent"
+    android:clipToPadding="false">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
+        android:gravity="start|center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+
+        <LinearLayout
+            android:id="@+id/icon_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="60dp"
+            android:orientation="horizontal"
+            android:paddingEnd="12dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp">
+            <com.android.internal.widget.PreferenceImageView
+                android:id="@android:id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="48dp"
+                android:maxHeight="48dp"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp">
+
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                android:ellipsize="marquee"/>
+
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+                android:textColor="?android:attr/textColorSecondary"
+                android:maxLines="10"/>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"/>
+
+</LinearLayout>
diff --git a/res/layout/preference_widget_master_switch.xml b/res/layout/preference_widget_master_switch.xml
index bca15f9..bc1cafd 100644
--- a/res/layout/preference_widget_master_switch.xml
+++ b/res/layout/preference_widget_master_switch.xml
@@ -24,7 +24,6 @@
       android:layout_height="match_parent"
       android:gravity="start|center_vertical"
       android:orientation="horizontal"
-      android:paddingStart="20dp"
       android:paddingEnd="20dp"
       android:paddingTop="16dp"
       android:paddingBottom="16dp">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 354bffd..f89f371 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Rekeninge"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ligging"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Rekeninge"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sekuriteit"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wagwoorde"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Wi-Fi-warmkol"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-verbinding"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Verbinding"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"USB-verbinding en Wi-Fi-warmkol"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan nie verbind of Wi-Fi-warmkol gebruik wanneer Databespaarder aan is nie"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-verbinding"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"As jy hierdie diens stop sal sommige eienskappe van jou foon dalk nie behoorlik werk nie totdat jy dit eers aan- en af skakel."</string>
     <string name="language_settings" msgid="8758655933029560944">"Tale en invoer"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tale en invoer"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Tale en streek"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Invoer en gebare"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Sleutelbord en invoermetodes"</string>
     <string name="phone_language" msgid="7116581601133118044">"Tale"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi betyds"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi betyds"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Geskiedenisdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Gebruikdetails"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruikdetails"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Oorbereken"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hou wakker"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Vir %1$s gebruik"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedert laas uitgeprop vir <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotale"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot Moenie steur nie"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Geen geïnstalleerde programme het toegang tot Moenie steur nie versoek nie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanale"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Hierdie program het nie enige kennisgewings geplaas nie"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (uitgevee)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Programme is nie geïnstalleer nie"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde programme"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Jou berging word nou deur die bergingbestuurder bestuur"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Rekeninge"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Stel op"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Outo-sinkroniseer rekeningdata"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Outo-sinkroniseer persoonlike rekening se data"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 62b7af6..462a4b3 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"መለያዎች"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"አካባቢ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"መለያዎች"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"ደህንነት"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"የይለፍ ቃሎች"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ተጓጓዥ ድረስ ነጥቦች"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ብሉቱዝ ማያያዝ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"መሰካት"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ተጓጓዥ መዳረሻ ነጥብ እና ማገናኛ"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ውሂብ ቆጣቢ በርቶ ሳለ ግንኙነት መዘርጋት ወይም ተንቀሳቃሽ የመገናኛ ነጥቦችን መጠቀም አይቻልም።"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB መሰካት"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ይህን አገልግሎት ለማቆም ከፈለግክ አጥፍተህ እንደገና እስክታበራው ድረስ አንዳንድ የስልክህ ገጽታዎች በትክክል መስራት ያቆማሉ ።"</string>
     <string name="language_settings" msgid="8758655933029560944">"ቋንቋዎች እና ግቤት"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ቋንቋዎች እና ግቤት"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ቋንቋዎች እና ክልል"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ግቤት እና የእጅ ውዝዋዜ ምልክቶች"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ሰሌዳ ቁልፍ እና የግቤት ዘዴዎች"</string>
     <string name="phone_language" msgid="7116581601133118044">"ቋንቋዎች"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"የመሣሪያማንቂያ ሰዓት"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi በጊዜ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi በጊዜ"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"የታሪክ ዝርዝሮች"</string>
     <string name="details_title" msgid="3792801565213935385">"ዝርዝሮች ተጠቀም"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ዝርዝሮችን ተጠቀም"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ የፈታበት"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"የተለያዩ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ከመጠን በላይ የተቆጠረ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ ብሏል"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ጠቅላላ አጠቃቀም"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"የአትረብሽ መዳረሻ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ሰርጦች"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ይህ መተግበሪያ ምንም ማሳወቂያዎችን አልለጠፈም"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ተሰርዟል)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"መተግበሪያዎች አልተጫኑም"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"የተጫኑ መተግበሪያዎች"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"የእርስዎ ማከማቻ አሁን በማከማቻ አስተዳዳሪ እየተዳደረ ነው"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"መለያዎች"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"አዋቅር"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"የመለያ ውሂብን በራስ-አስምር"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"የግል መለያ ውሂብን በራስ-አስምር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cb7bc9f..a830fc7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -337,7 +337,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"الحسابات"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
     <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
@@ -1297,7 +1298,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"نقطة اتصال محمولة"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ربط البلوتوث"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ربط"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"الربط ونقطة الاتصال المحمولة"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"يتعذر توصيل نقاط الاتصال المحمولة أو استخدامها أثناء تشغيل توفير البيانات"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏تقييد USB"</string>
@@ -1641,8 +1643,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"في حالة إيقاف هذه الخدمة، ربما تتوقف بعض ميزات الهاتف عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
     <string name="language_settings" msgid="8758655933029560944">"اللغات والإدخال"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"اللغات والإدخال"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"اللغة والمنطقة"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"الإدخال والإيماءات"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"لوحة المفاتيح وأساليب الإدخال"</string>
     <string name="phone_language" msgid="7116581601133118044">"اللغات"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1912,6 +1912,8 @@
     <string name="awake" msgid="387122265874485088">"وقت الوضع النشط للجهاز"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏وقت تشغيل Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏وقت تشغيل Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"تفاصيل السجل"</string>
     <string name="details_title" msgid="3792801565213935385">"تفاصيل الاستخدام"</string>
     <string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>
@@ -1928,6 +1930,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"الهاتف خامل"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"متنوعة"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"استخدام زائد عن الحد"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"‏إجمالي استخدام CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU في المقدمة"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ابق متيقظًا"</string>
@@ -1979,6 +1989,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"إجمالي الاستخدام"</string>
@@ -2499,6 +2511,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2790,7 +2804,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"الوصول إلى إعداد \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"لم تطلّب أي تطبيقات مثبّتة حق الوصول إلى إعداد \"الرجاء عدم الإزعاج\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"القنوات"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"لم ينشر هذا التطبيق أي إشعارات"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (محذوفة)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"حظر الكل"</string>
@@ -3448,7 +3465,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"التطبيقات غير مثبَّتة"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"التطبيقات المثبَّتة"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة السعة التخزينية لجهازك الآن عن طريق مدير السعة التخزينية"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"الحسابات"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"تهيئة"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"مزامنة بيانات الحساب تلقائيًا"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"مزامنة الحساب الشخصي تلقائيًا"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index be466f4..40970d0 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hesablar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Yer"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesablar"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Təhlükəsizlik"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portativ hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth birləşmə"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Birləşmə"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Birləşmə və daşınan hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Data Qənaəti aktiv olduqda daşınan hotspotları birləşdirmək və ya istifadə etmək olmur"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB Birləşmə"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Bu xidməti dayandırdığınız halda telefonunuzun bəzi özəllikləri telefonu söndürüb yandıracağınız vaxta qədər düzgün işləməyə bilərlər."</string>
     <string name="language_settings" msgid="8758655933029560944">"Dillər və daxiletmə"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Dillər və daxiletmə"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Dil və region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Daxiletmə və jestlər"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klaviatura &amp; daxiletmə metodları"</string>
     <string name="phone_language" msgid="7116581601133118044">"Dillər"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Cihazın oyaq vaxtı"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi vaxtında"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi zamanı"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Tarixçə detalları"</string>
     <string name="details_title" msgid="3792801565213935385">"Ətraflı istifadə"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Ətraflı istifadə"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inaktivdir"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Müxtəlif"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Artıq hesablanmış"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU toplam"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Oyaq saxla"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> şəbəkədən ayrılandan bəri"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ərzində elektrikə qoşulmayıb"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ümumi istifadə"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Narahat etməyin\" girişi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanallar"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Bu tətbiq heç bir bildiriş paylaşmayıb"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (silindi)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Hamısını bloklayın"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Tətbiq quraşdırılmayıb"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Quraşdırılmış tətbiqlər"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Yaddaşınız indi yaddaş meneceri tərəfindən idarə olunur"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Hesablar"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiqurasiya edin"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Hesab datasını avtomatik sinxronlaşdırın"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Şəxsi hesab datasını avtomatik sinxronlaşdırın"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 789d40c..49833c9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -331,7 +331,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Nalozi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Nalozi"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Bezbednost"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja SIM kartice i zaključavanja akreditiva skladišta"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja skladišta akreditiva"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lozinke"</string>
@@ -1267,7 +1268,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosni hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth privezivanje"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Povezivanje sa internetom"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Povezivanje i prenosni hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nije moguće privezivanje niti korišćenje prenosivih hotspotova dok je Ušteda podataka uključena"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB povezivanje"</string>
@@ -1608,8 +1610,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati ispravno da funkcionišu dok ne isključite i ponovo uključite telefon."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Jezici i region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Unos i pokreti"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i metode unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1861,6 +1861,8 @@
     <string name="awake" msgid="387122265874485088">"Vreme buđenja uređaja"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vreme"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vreme"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalji istorije"</string>
     <string name="details_title" msgid="3792801565213935385">"Korišćenje detalja"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Korišćenje detalja"</string>
@@ -1877,6 +1879,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Prekomerno izračunata"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno korišćenje procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor u prednjem planu"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži van stanja spavanja"</string>
@@ -1928,6 +1938,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Koristi se %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom poslednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korišćeno"</string>
@@ -2436,6 +2448,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2721,7 +2735,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zahtevala pristup opciji Ne uznemiravaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije postavila nijedno obaveštenje"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (izbrisano)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
@@ -3343,7 +3360,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacije koje nisu instalirane"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Memorijskim prostorom sada upravlja Menadžer memorijskog prostora"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Nalozi"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurišite"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autom. sinhr. podatke sa naloga"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autom. sinhr. lične podatke sa naloga"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1bfeac4..97c9b61 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Уліковыя запісы"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Месцазнаходжанне"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Уліковыя запісы"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Бяспека"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устанавіць маё месцазнаходжанне, разблакаванне экрана, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Партатыўная кропка доступу"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-мадэм"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Мадэм"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Мадэм і партатыўны хотспот"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Немагчыма выкарыстоўваць мадэм або партатыўныя хот-споты, калі ўключана Эканомія трафіка"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-мадэм"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Калі вы спыніце гэтую службу, некаторыя функцыі тэлефона могуць перастаць працаваць правільна, пакуль вы не выключыце і зноў не ўключыце яго."</string>
     <string name="language_settings" msgid="8758655933029560944">"Мовы і ўвод"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Мовы і ўвод"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Мовы і рэгіён"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Увод і жэсты"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Клавіятура і раскладкi"</string>
     <string name="phone_language" msgid="7116581601133118044">"Мовы"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Час з моманту ўключэння прылады"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi у тэрмін"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi у тэрмiн"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Падрабязнасці гісторыі"</string>
     <string name="details_title" msgid="3792801565213935385">"Падрабязнасці выкарыстання"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Падрабязнасці выкарыстання"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Тэлефон у рэжыме чакання"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Рознае"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Няўлічанае"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – усяго"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Асноўнае выкарыстанне працэсару"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не ўвах. у рэжым сна"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Вынікі выкарыстання"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ да рэжыму «Не турбаваць»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка дадаткаў..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Каналы"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Гэта праграма не размяшчала ніякіх апавяшчэнняў"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (выдалены)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блакіраваць усё"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Праграмы не ўсталяваны"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Усталяваныя праграмы"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ваша сховішча зараз знаходзіцца пад кіраваннем менеджара сховішча"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Уліковыя запісы"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Наладзіць"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Аўтасiнхр. даных улік. запісу"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Аўтасінхр. дан. асаб. ул. зап."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bc58498..8ec52fc 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Профили"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Профили"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Сигурност"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Преносима точка за достъп"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Тетъринг през Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Тетъринг"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Тетъринг и пренос. точка за достъп"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"При включена Икономия на данни не можете да активирате функцията за тетъринг, нито да използвате преносими точки за достъп"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Тетъринг през USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако спрете тази услуга, е възможно някои функции на телефона ви да спрат да работят правилно, докато не го изключите и включите отново."</string>
     <string name="language_settings" msgid="8758655933029560944">"Езици и въвеждане"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Езици и въвеждане"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Езици и регион"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Въвеждане и жестове"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Клавиатура и методи за въвеждане"</string>
     <string name="phone_language" msgid="7116581601133118044">"Езици"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Активно време на устройство"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Време на включен Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Време на включен Wi‑Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"История"</string>
     <string name="details_title" msgid="3792801565213935385">"Подробности"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Подробности"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефонът не се използва"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Друго"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Отчетено в повече"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Процесор, общо"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Оставяне в будно състояние"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Обща употреба"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Канали"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Това приложение не е публикувало известия"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"„<xliff:g id="CHANNEL_NAME">%1$s</xliff:g>“ (изтрито)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Приложения, които не са инсталирани"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Хранилището ви вече се управлява от съответния мениджър"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Профили"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Конфигуриране"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Данни от профила: Авт. синхрон"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Данни от личния профил: Авт. синхрон"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index a1da2a7..729ed7a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"অবস্থান"</string>
     <string name="account_settings_title" msgid="626177544686329806">"অ্যাকাউন্টগুলি"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"নিরাপত্তা"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"পাসওয়ার্ড"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"পোর্টেবল হটস্পট"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ব্লুটুথ টেদারিং"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"টেদারিং"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"টেদারিং ও পোর্টেবল হটস্পট"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ডেটা সেভার চালু থাকা অবস্থায় টেদার করা যাবে না বা পোর্টেবল হটস্পট ব্যবহার করা যাবে না"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB টেদারিং"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ফোনের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
     <string name="language_settings" msgid="8758655933029560944">"ভাষাগুলি এবং ইনপুট"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ভাষাগুলি এবং ইনপুট"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ভাষাগুলি এবং অঞ্চল"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ইনপুট এবং অঙ্গভঙ্গি"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"কিবোর্ড ও ইনপুট পদ্ধতি"</string>
     <string name="phone_language" msgid="7116581601133118044">"ভাষাগুলি"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ডিভাইস জাগ্রত সময়"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ওয়াই-ফাই চালু থাকা মোট সময়"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ওয়াই-ফাই চালু থাকা মোট সময়"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ইতিহাস বিবরণ"</string>
     <string name="details_title" msgid="3792801565213935385">"বিবরণ ব্যবহার করুন"</string>
     <string name="details_subtitle" msgid="32593908269911734">"বিবরণ ব্যবহার করুন"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ফোন নিষ্ক্রিয়"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"বিবিধ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"নির্ধারিত থেকে বেশী"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU মোট"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ফোরগ্রাউন্ড"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"জাগ্রত রাখুন"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"মোট ব্যবহার"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"বিরক্ত করবেন না অ্যাক্সেস করুন"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবেন না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"চ্যানেল"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"এই অ্যাপটি দ্বারা কোন বিজ্ঞপ্তি পোস্ট করা হয়নি"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (মুছে দেওয়া হয়েছে)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"সমস্ত অবরুদ্ধ করুন"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"অ্যাপ্স ইনস্টল করা হয়নি"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ইনস্টল করা অ্যাপ্স"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার সঞ্চয়স্থান এখন সঞ্চয়স্থান পরিচালকের দ্বারা পরিচালিত হচ্ছে"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"অ্যাকাউন্ট"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"কনফিগার"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"অ্যাকাউন্টের ডেটা স্বতঃসিঙ্ক"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ব্যক্তিগত অ্যাকাউন্টের ডেটা স্বতঃসিঙ্ক"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 3db4e95..cebf6d2 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -331,7 +331,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sigurnost"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje SIM kartice, zaključavanje pohrane akreditiva"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje pohrane akreditiva"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lozinke"</string>
@@ -1267,7 +1268,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosna pristupna tačka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prijenosna pristupna tačka"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je upaljena Ušteda podataka nije moguće povezati uređaj niti koristiti prijenosne pristupne tačke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB veze"</string>
@@ -1608,8 +1610,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Jezici i regija"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Unos i pokreti"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i načini unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1861,6 +1861,8 @@
     <string name="awake" msgid="387122265874485088">"Vrijeme aktivnosti uređaja"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi na vrijeme"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi na vrijeme"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalji historije"</string>
     <string name="details_title" msgid="3792801565213935385">"Koristi detalje"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Koristi detalje"</string>
@@ -1877,6 +1879,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u stanju mirovanja"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Prekoračenje izračuna"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU u prvom planu"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Drži aktivnim"</string>
@@ -1928,6 +1938,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Vrijeme korištenja: %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja s napajanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom posljednjeg isključivanja s napajanja <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korištenje"</string>
@@ -2436,6 +2448,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2721,7 +2735,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup Ne smetaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nikakva obavještenja"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"Kanal <xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (izbrisan)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
@@ -3343,7 +3360,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Neinstalirane aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vašom pohranom sada upravlja upravitelj pohrane"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Računi"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriraj"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto. sinhr. podataka o računu"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto. sinhr. lič. podat. rač."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0d9633a..106be32 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicació"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Seguretat"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
@@ -534,16 +535,16 @@
       <item quantity="one">Ha de contenir com a mínim 1 lletra</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
-      <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> lletres en minúscula</item>
-      <item quantity="one">Ha de contenir com a mínim 1 lletra en minúscula</item>
+      <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> lletres minúscules</item>
+      <item quantity="one">Ha de contenir com a mínim 1 lletra minúscula</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
-      <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> lletres en majúscula</item>
-      <item quantity="one">Ha de contenir com a mínim 1 lletra en majúscula</item>
+      <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> lletres majúscules</item>
+      <item quantity="one">Ha de contenir com a mínim 1 lletra majúscula</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
-      <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> dígits numèrics</item>
-      <item quantity="one">Ha de contenir com a mínim 1 dígit numèric</item>
+      <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> dígits</item>
+      <item quantity="one">Ha de contenir com a mínim 1 dígit</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
       <item quantity="other">Ha de contenir com a mínim <xliff:g id="COUNT">%d</xliff:g> símbols especials</item>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Punt d\'accés Wi-Fi"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Compartició de xarxa per Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Compartició de xarxa"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Compartició de xarxa i punt d\'accés Wi-Fi"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No es pot compartir la xarxa ni utilitzar punts d\'accés Wi-Fi mentre la funció Economitzador de dades està activada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartició de xarxa per USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si atures aquest servei, és possible que hi hagi funcions del telèfon que deixin de funcionar correctament fins que no l\'apaguis i el tornis a engegar."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomes i introducció de text"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomes i introducció de text"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idiomes i regió"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrada i gestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclat i mètodes d\'introducció"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomes"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Temps d\'activació del dispositiu"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a temps"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalls de l\'historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalls d\'ús"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Altres"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Comptabilitzada més d\'una vegada"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantén actiu"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"S\'ha utilitzat durant %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> des de la desconnexió"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Mentre es va desconnectar per darrera vegada durant <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totals d\'ús"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accés No molesteu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Cap aplicació instal·lada no ha sol·licitat accés No molesteu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canals"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"No hi ha cap notificació per a aquesta aplicació"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (suprimit)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicacions no instal·lades"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacions instal·lades"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ara mateix, el gestor d\'emmagatzematge gestiona el teu emmagatzematge"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Comptes"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configuració"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinc. aut. de dades del compte"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinc. aut. dades compte pers."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a558575..88016bf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečení"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Přenosný hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Připojení přes Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Sdílené připojení"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Sdílené připojení a přenosný hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Když je zapnutý Spořič obrazovky, nelze sdílet datové připojení ani používat přenosné hotspoty"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Připojení přes USB"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Pokud tuto službu zastavíte, může se stát, že některé funkce tabletu nebudou fungovat správně, dokud telefon nevypnete a opět nezapnete."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jazyky a zadávání"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jazyky a zadávání"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Jazyky a oblast"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Zadávání a gesta"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klávesnice a metody zadávání"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jazyky"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Doba provozu Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Doba provozu modulu Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti historie"</string>
     <string name="details_title" msgid="3792801565213935385">"Podr. využívání"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti využívání"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Různé"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Nadhodnoceno"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
@@ -1945,6 +1955,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Doba používání: %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využití baterie celkem"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Přístup při nastavení Nerušit"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"O přístup při nastavení Nerušit nepožádaly žádné nainstalované aplikace"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanály"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Tato aplikace neodeslala žádná oznámení"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (smazáno)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikace nejsou nainstalovány"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainstalované aplikace"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Úložiště je nyní spravováno správcem úložiště."</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Účty"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurace"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Aut. synchronizovat data účtu"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Aut. synch. data osobního účtu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f1b4e0c..985a08a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Netdeling via Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Netdeling"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Netdeling og hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Der kan ikke bruges netdeling eller bærbare hotspots, når Datasparefunktion er aktiveret"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Netdeling via USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Hvis du stopper denne tjeneste, kan nogle af funktionerne på din tablet holde op med at fungere korrekt, indtil du slukker og derefter tænder den igen."</string>
     <string name="language_settings" msgid="8758655933029560944">"Sprog og indtastning"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Sprog og indtastning"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Sprog og område"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Indtastning og bevægelser"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatur og inputmetoder"</string>
     <string name="phone_language" msgid="7116581601133118044">"Sprog"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Enhedens aktivtid"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi til tiden"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi til tiden"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detaljeret historik"</string>
     <string name="details_title" msgid="3792801565213935385">"Brugsdetaljer"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Inaktiv telefon"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Overvurderet"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Lås ikke"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Brugt i %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siden sidste afbrydelse for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Brugstotal"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Adgang til \"Forstyr ikke\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerede apps har anmodet om adgang, når indstillingen \"Forstyr ikke\" er aktiveret."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanaler"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Denne app har ikke sendt nogen underretninger"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (slettet)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps, som ikke er installeret"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerede aps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Din lagerplads administreres nu af lageradministratoren"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Konti"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurer"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Automatisk synk. af kontodata"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Aut. synk. af data på personlig konto"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e5c31da..1178aa8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -328,7 +328,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konten"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Standort"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konten"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sicherheit"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldedatenspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobiler Hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-Tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; mobiler Hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tethering oder Verwendung von mobilen Hotspots nicht möglich, während der Datensparmodus aktiviert ist"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-Tethering"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Telefons nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
     <string name="language_settings" msgid="8758655933029560944">"Sprachen &amp; Eingabe"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Sprachen &amp; Eingabe"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Sprachen &amp; Region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Eingabe &amp; Bewegungen"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatur &amp; Eingabemethoden"</string>
     <string name="phone_language" msgid="7116581601133118044">"Sprachen"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN-Aktivzeit"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN-Aktivzeit"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Verlaufsdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Infos zum Verbrauch"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Sonstiges"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Zu hoch berechnet"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Nutzungsdauer: %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Seit dem letzten Ausstecken für <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Verbrauch insgesamt"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanäle"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Für diese App gibt es keine Benachrichtigungen"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (gelöscht)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
@@ -3310,7 +3327,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Nicht installierte Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installierte Apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Dein Speicher wird jetzt vom Speichermanager verwaltet"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Konten"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurieren"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Kontodaten autom. synchronisieren"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Daten des privaten Kontos autom. synchronisieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4e197a6..46e6bd6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Λογαριασμοί"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Τοποθεσία"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Λογαριασμοί"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Ασφάλεια"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Φορητό σημείο πρόσβασης"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Πρόσδεση Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Πρόσδεση"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Πρόσ. και φορητό σημ. πρόσβ."</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Δεν είναι δυνατή η σύνδεση σε φορητό σημείο πρόσβασης Wi-Fi, ενώ είναι ενεργοποιημένη η Εξοικονόμηση δεδομένων"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Πρόσδεση USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Αν διακόψετε τη λειτουργία αυτής της συσκευής, ενδέχεται να σταματήσει η σωστή εκτέλεση ορισμένων λειτουργιών του τηλεφώνου σας, μέχρι να το απενεργοποιήσετε και να το ενεργοποιήσετε ξανά."</string>
     <string name="language_settings" msgid="8758655933029560944">"Γλώσσες &amp; εισαγωγή"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Γλώσσες &amp; εισαγωγή"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Γλώσσες και περιοχή"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Είσοδος και κινήσεις"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Πληκτρολογιο &amp; μεθοδοι εισοδου"</string>
     <string name="phone_language" msgid="7116581601133118044">"Γλώσσες"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Χρόνος ενεργοποίησης της συσκευής"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi στην ώρα του"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi στην ώρα του"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Λεπτομέρειες ιστορικού"</string>
     <string name="details_title" msgid="3792801565213935385">"Λεπτομέρειες χρήσης"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Λεπτομέρειες χρήσης"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Διάφορα"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Υπερεκτίμηση"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Συνολικές τιμές χρήσης"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Πρόσβαση \"Μην ενοχλείτε\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Δεν ζητήθηκε πρόσβαση στη λειτουργία \"Μην ενοχλείτε\" από εγκατεστημένες εφαρμογές"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Κανάλια"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Αυτή η εφαρμογή δεν έχει δημοσιεύσει ειδοποιήσεις"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (διαγράφηκε)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Αποκλεισμός όλων"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Μη εγκατεστημένες εφαρμογές"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Εγκατεστημένες εφαρμογές"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Στο εξής, γίνεται διαχείριση του αποθηκευτικού σας χώρου από τον διαχειριστή αποθηκευτικού χώρου"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Λογαριασμοί"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Διαμόρφωση"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Αυτ. συγχρ. δεδομένων λογαρ."</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Αυτ. συγχρ. δεδομ. πρ. λογαρ."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 16ab4a5..7b125ad 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; portable hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Can’t tether or use portable hotspots while Data Saver is on"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
     <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Languages &amp; region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Input &amp; gestures"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="7116581601133118044">"Languages"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
     <string name="details_title" msgid="3792801565213935385">"Use details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Channels"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (deleted)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto-sync account data"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto-sync personal account data"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 23d4cf0..b287748 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; portable hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Can’t tether or use portable hotspots while Data Saver is on"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
     <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Languages &amp; region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Input &amp; gestures"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="7116581601133118044">"Languages"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
     <string name="details_title" msgid="3792801565213935385">"Use details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Channels"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (deleted)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto-sync account data"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto-sync personal account data"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 23d4cf0..b287748 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; portable hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Can’t tether or use portable hotspots while Data Saver is on"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
     <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Languages &amp; region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Input &amp; gestures"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="7116581601133118044">"Languages"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
     <string name="details_title" msgid="3792801565213935385">"Use details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Channels"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (deleted)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto-sync account data"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto-sync personal account data"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1dd40fd..3dc23dc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Anclaje a red Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Anclaje a red"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Anclaje a red y zona portátil"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No se puede realizar una conexión mediante dispositivo portátil ni usar hotspot portátil cuando se activa el modo Ahorro de datos"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje a red USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, algunas funciones del dispositivo podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas y entradas"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas y entradas"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idiomas y región"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrada y gestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de entrada"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a tiempo"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a tiempo"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalles del historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalles de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Varios"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Se usó durante %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante la última desconexión para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de usos"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2696,7 +2710,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada solicitó acceso a No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canales"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Esta app no publicó ninguna notificación"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (borrado)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
@@ -3306,7 +3323,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps no instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tu almacenamiento ahora está a cargo del administrador de almacenamiento"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Cuentas"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configuración"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sincronizar datos de la cuenta automáticamente"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sincronizar datos de la cuenta personal automáticamente"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 73d117b..3718e1f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Compartir por Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Compartir Internet"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Compartir Internet y zona Wi-Fi"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No se puede hacer el anclaje de red ni utilizar zonas Wi-Fi portátiles mientras el ahorro de datos esté activado"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartir por USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, es posible que algunas funciones del teléfono dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e introducción de texto"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introducción de texto"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idiomas y región"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrada y gestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de introducción"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tiempo de conexión Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tiempo de conexión Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalles del historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalles de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Varios"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilizada durante %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de consumo"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso de No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canales"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicación no ha publicado ninguna notificación"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (eliminado)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicaciones no instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicaciones instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"El Administrador de Almacenamiento gestiona ahora el almacenamiento"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Cuentas"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sincr. autom. datos de cuenta"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sincr. autom. datos personales"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e35aaad..615036c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontod"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Asukoht"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontod"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Turvalisus"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroolid"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Kantav tööpunkt"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothi jagamine"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jagamine"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Jagam. ja kant. kuumkoht"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kui andmeside mahu säästja on sisse lülitatud, siis ei saa jagada ega kasutada teisaldatavat leviala"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB jagamine"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Kui teenuse peatate, ei pruugi mõned telefoni funktsioonid õigesti töötada, kuni selle välja ja seejärel uuesti sisse lülitate."</string>
     <string name="language_settings" msgid="8758655933029560944">"Keeled ja sisend"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Keeled ja sisend"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Keeled ja piirkond"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Sisend ja liigutused"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klaviatuur ja sisestusmeetodid"</string>
     <string name="phone_language" msgid="7116581601133118044">"Keeled"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Seadme ärkveloleku aeg"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WiFi õigel ajal"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WiFi õigel ajal"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Ajaloo üksikasjad"</string>
     <string name="details_title" msgid="3792801565213935385">"Üksikasjade kasutamine"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Kasuta detaile"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon tegevuseta"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Muu"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Liigselt arvestatud"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kokku"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hoia ärkvel"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> alates lahutamisest"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Alates viimasest lahutamisest <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kasutus kokku"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Juurdepääs funktsioonile Mitte segada"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ükski installitud rakendus pole palunud juurdepääsu funktsioonile Mitte segada"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanalid"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"See rakendus pole postitanud ühtegi märguannet"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (kustutatud)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Rakendused pole installitud"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installitud rakendused"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Teie salvestusruumi haldab nüüd salvestusruumi haldur"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Kontod"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Seadistamine"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Kontoandmete autom. sünkroon."</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Isikl. konto andm. aut. sünkr."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8cefa92..c0d6f27 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Segurtasuna"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Pasahitzak"</string>
@@ -531,23 +532,23 @@
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"Ikur bat eduki behar du gutxienez"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
       <item quantity="other">Gutxienez <xliff:g id="COUNT">%d</xliff:g> hizki izan behar ditu</item>
-      <item quantity="one">Gutxienez hizki bat izan behar du</item>
+      <item quantity="one">Gutxienez 1 hizki izan behar du</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
       <item quantity="other">Gutxienez <xliff:g id="COUNT">%d</xliff:g> minuskula izan behar ditu</item>
-      <item quantity="one">Gutxienez minuskula bat izan behar du</item>
+      <item quantity="one">Gutxienez 1 minuskula izan behar du</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
       <item quantity="other">Gutxienez <xliff:g id="COUNT">%d</xliff:g> maiuskula izan behar ditu</item>
-      <item quantity="one">Gutxienez maiuskula bat izan behar du</item>
+      <item quantity="one">Gutxienez 1 maiuskula izan behar du</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
       <item quantity="other">Gutxienez <xliff:g id="COUNT">%d</xliff:g> zenbaki izan behar ditu</item>
-      <item quantity="one">Gutxienez zenbaki bat izan behar du</item>
+      <item quantity="one">Gutxienez 1 zenbaki izan behar du</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
       <item quantity="other">Gutxienez <xliff:g id="COUNT">%d</xliff:g> karaktere berezi izan behar ditu</item>
-      <item quantity="one">Gutxienez karaktere berezi bat izan behar du</item>
+      <item quantity="one">Gutxienez 1 karaktere berezi izan behar du</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
       <item quantity="other">Hizkiak ez diren <xliff:g id="COUNT">%d</xliff:g> karaktere bat izan behar du gutxienez</item>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Sare publiko eramangarria"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Konexioa partekatzea (Bluetooth)"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Konexioa partekatzea"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Konexioa partekatzea eta sare publikoak"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Datu-aurrezlea aktibatuta badago, ezin da partekatu konexioa, ezta sare publiko eramangarriak erabili ere"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Konexioa partekatzea (USB)"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Zerbitzua gelditzen baduzu, agian telefonoko eginbide batzuk behar bezala funtzionatzeari utziko diote, telefonoa itzali eta berriro piztu arte."</string>
     <string name="language_settings" msgid="8758655933029560944">"Hizkuntza eta idazketa"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Hizkuntza eta idazketa"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Hizkuntzak eta lurraldea"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Idazketa eta keinuak"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teklatua eta idazketa-metodoak"</string>
     <string name="phone_language" msgid="7116581601133118044">"Hizkuntzak"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Gailua aktibo egondako denbora"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi garaiz"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi garaiz"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Historiaren xehetasunak"</string>
     <string name="details_title" msgid="3792801565213935385">"Erabilera-xehetasunak"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Erabilera-xehetasunak"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonoa inaktibo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Askotarikoak"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Uste baino gutxiago erabili da"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"PUZaren erabilera, guztira"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUaren aurreko planoa"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantendu aktibo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Erabilitako denbora: %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> entxufea atera zenetik"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Azken aldiz entxufea atera ondoren (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Erabilera, guztira"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Ez molestatu\" aukerarako sarbidea"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanalak"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Aplikazioak ez du argitaratu jakinarazpenik"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ezabatuta)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Instalatu gabeko aplikazioak"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalatutako aplikazioak"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Biltegi-kudeatzailea ari da biltegia kudeatzen"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Kontuak"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguratu"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinkronizatu automatikoki kontua"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinkronizatu automatikoki kontu pertsonala"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 18512f0..3f2d51c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"حساب‌ها"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مکان"</string>
     <string name="account_settings_title" msgid="626177544686329806">"حساب‌ها"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"امنیت"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"گذرواژه‌ها"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"نقطه اتصال قابل حمل"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"اتصال اینترنت با تلفن همراه بلوتوث"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"اتصال به اینترنت با تلفن همراه"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"تترینگ و نقطه اتصال قابل حمل"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"هنگامی که محافظ صفحه روشن است نمی‌توانید از نقاط اتصال قابل حمل یا اتصال به اینترنت با تلفن همراه استفاده کنید"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏اتصال داده با سیم USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"اگر این سرویس را متوقف کنید، برخی از قابلیت‌های گوشی شما ممکن است تا زمانی که گوشی را خاموش و سپس دوباره روشن کنید، به‌درستی کار نکنند."</string>
     <string name="language_settings" msgid="8758655933029560944">"زبان‌ها و ورودی"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"زبان‌ها و ورودی"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"زبان‌ها و منطقه"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ورودی و اشاره‌ها"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"صفحه‌کلید و روش‌های ورودی"</string>
     <string name="phone_language" msgid="7116581601133118044">"زبان‌ها"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi به موقع"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi به موقع"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"جزئیات سابقه"</string>
     <string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
     <string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"موارد دیگر"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"بیش از حد محاسبه شده"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"‏مقدار کل CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏پیش زمینه CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار باش"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"مقدار کل استفاده"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"دسترسی به «مزاحم نشوید»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"هیچ برنامه نصب شده‌ای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"کانال‌ها"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"این برنامه هیچ اعلانی پست نکرده است"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (حذف شده)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"برنامه‌های نصب‌نشده"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"برنامه‌های نصب‌شده"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"حافظه شما اکنون توسط مدیر حافظه مدیریت می‌شود"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"حساب‌ها"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"پیکربندی"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"همگام‌سازی خودکار داده‌های حساب"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"همگام‌سازی خودکار داده‌‌های حساب شخصی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8f41ce8..5f6f581 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tilit"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Sijainti"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tilit"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Suojaus"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Kannettava yhteyspiste"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Jaettu Bluetooth-yhteys"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jaettu yhteys"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Jaettu yhteys ja kannettava yhteyspiste"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kun Data Saver on käytössä, puhelinta ei voi käyttää modeemina eikä kannettavien hotspotien käyttäminen onnistu."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetin jakaminen USB:n kautta"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jos pysäytät palvelun, jotkut puhelimen toiminnot eivät välttämättä enää toimi oikein, kunnes sammutat laitteen ja käynnistät sen uudelleen."</string>
     <string name="language_settings" msgid="8758655933029560944">"Kielet ja syöttötapa"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Kielet ja syöttötapa"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Kielet ja alue"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Syöttäminen ja eleet"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Näppäimistö ja syöttötavat"</string>
     <string name="phone_language" msgid="7116581601133118044">"Kielet"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Laitteen käytössäoloaika"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-yhteyden käytössäoloaika"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi-yhteyden käytössäoloaika"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Historiatiedot"</string>
     <string name="details_title" msgid="3792801565213935385">"Käyttötiedot"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Käyttötiedot"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Muut"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Yliarvioitu"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Käytetty %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Laturin irrottamisen jälkeen (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Käyttö yhteensä"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Älä häiritse -käyttöoikeudet"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yksikään asennettu sovellus ei ole pyytänyt Älä häiritse -tilan käyttöoikeutta."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanavat"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Tämä sovellus ei ole lähettänyt ilmoituksia."</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (poistettu)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Sovelluksia ei asennettu"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Asennetut sovellukset"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tallennustilan hallinta hallitsee nyt tallennustilaasi."</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Tilit"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Määritä"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Tilitietojen autom. synkron."</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Omien tietojen autom. synkron."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0163c3d..876e433 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
@@ -518,10 +519,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vous entrez un mot de passe professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Trop de tentatives incorrectes. Votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Fermer"</string>
-    <!-- no translation found for lockpassword_password_too_short (2726090378672764986) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_short (3638188874397727648) -->
-    <skip />
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Doit comprendre au moins <xliff:g id="COUNT">%d</xliff:g> caractères"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Le NIP doit comprendre au moins <xliff:g id="COUNT">%d</xliff:g> chiffres"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"Doit contenir moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
     <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"Doit contenir moins de <xliff:g id="NUMBER">%d</xliff:g> chiffres."</string>
@@ -531,12 +530,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Doit contenir au moins une lettre"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Doit contenir au moins un chiffre"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"Doit contenir au moins un symbole"</string>
-    <!-- no translation found for lockpassword_password_requires_letters (9013132344745898400) -->
-    <!-- no translation found for lockpassword_password_requires_lowercase (2626327674921055486) -->
-    <!-- no translation found for lockpassword_password_requires_uppercase (7860796359913920356) -->
-    <!-- no translation found for lockpassword_password_requires_numeric (1967587658356336828) -->
-    <!-- no translation found for lockpassword_password_requires_symbols (6751305770863640574) -->
-    <!-- no translation found for lockpassword_password_requires_nonletter (4440596998172043055) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre</item>
+      <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre minuscule</item>
+      <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres minuscules</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre majuscule</item>
+      <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres majuscules</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> chiffre</item>
+      <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> chiffres</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère spécial</item>
+      <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères spéciaux</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère autre qu\'une lettre</item>
+      <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères autres qu\'une lettre</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un mot de passe récent."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Les suites de chiffres croissantes, décroissantes ou répétitives ne sont pas autorisées."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -1241,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Via Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partage de connexion"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la fonction Économiseur de données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Partage de connexion par USB"</string>
@@ -1581,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si vous arrêtez ce service, certaines fonctionnalités de votre téléphone peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
     <string name="language_settings" msgid="8758655933029560944">"Langues et modes d\'entrée"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Langues et modes d\'entrée"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Langues et région"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrée et gestes"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Clavier et modes de saisie"</string>
     <string name="phone_language" msgid="7116581601133118044">"Langues"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1828,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Détails de l\'historique"</string>
     <string name="details_title" msgid="3792801565213935385">"Détails d\'utilisation"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -1844,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Divers"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Durée d\'utilisation totale de l\'UC"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -1895,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilisée pendant %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
@@ -2399,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2682,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès au mode « Ne pas déranger »"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canaux"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Cette application n\'a publié aucune notification"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (supprimé)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
@@ -3292,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Applications non installées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est maintenant géré par le gestionnaire de stockage"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Comptes"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Synchro auto données du compte"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sync auto données compte perso"</string>
@@ -3358,10 +3392,8 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Désactivé"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
-    <!-- no translation found for audio_files_title (4777048870657911307) -->
-    <skip />
-    <!-- no translation found for audio_storage_title (5494923634269236874) -->
-    <skip />
+    <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="2088190546280992258">"Désinstallé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>\n"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"Désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>\n"</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 8c25567..ff2af7c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localisation"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Partage connexion Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partage de connexion"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la sauvegarde des données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Via USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si vous arrêtez ce service, certaines fonctionnalités de votre téléphone peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
     <string name="language_settings" msgid="8758655933029560944">"Langues et saisie"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Langues et saisie"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Langues et région"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Saisie et gestes"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Clavier et modes de saisie"</string>
     <string name="phone_language" msgid="7116581601133118044">"Langues"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Historique"</string>
     <string name="details_title" msgid="3792801565213935385">"Infos utilisation"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Autres utilisations"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Processeur - Durée totale"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Processeur - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilisée pendant %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès \"Ne pas déranger\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aucune demande d\'accès \"Ne pas déranger\" n\'a été envoyée par les applications installées."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Chaînes"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Cette application n\'a publié aucune notification"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (supprimée)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Applications pas installées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est désormais géré par le gestionnaire d\'espace de stockage."</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Comptes"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Synchro auto données du compte"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Synchro auto données perso"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 8c2ae03..22034f3 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Seguranza"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasinais"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona interactiva portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ancoraxe de Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ancoraxe á rede"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ancoraxe á rede e zona wifi"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Non se pode compartir a conexión nin utilizar zonas wifi portátiles mentres o economizador de datos estea activado"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Ancoraxe de USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se detés este servizo, é posible que algunhas funcións do teléfono deixen de funcionar correctamente ata que o apagues e o acendas de novo."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e entrada"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e entrada"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idiomas e rexión"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrada e xestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e métodos de entrada"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Hora de activación do dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de conexión wifi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de conexión wifi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalles do historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalles do uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Varios"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Reconto excesivo"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Tempo de uso da batería: %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectou"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Uso da batería desde a última desconexión: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Cifras totais de uso"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso de Non molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso de Non molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canles"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicación non emitiu notificacións"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (eliminouse)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicacións non instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacións instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Agora o xestor de almacenamento administra o teu espazo"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sincronizar automaticamente os datos da conta"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Datos da conta persoal de sincronización automática"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 39dad90..9f83ed6 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"સુરક્ષા"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"મારું સ્થાન, સ્ક્રીન અનલૉક, SIM કાર્ડ લૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"મારું સ્થાન, સ્ક્રીન અનલૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"પાસવર્ડ્સ"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"પોર્ટેબલ હોટસ્પોટ"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ટિથરિંગ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ટિથરિંગ"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ટિથરિંગ અને પોર્ટેબલ હોટસ્પોટ"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ડેટા સેવર ચાલુ હોય તે વખતે ટીથર કરી શકતાં નથી અથવા તો પોર્ટેબલ હોટસ્પોટ્સનો ઉપયોગ કરી શકતાં નથી"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ટિથરિંગ"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"જો તમે આ સેવા બંધ કરો છો, તો તમારા ફોનની કેટલીક સુવિધાઓ કાર્ય કરતી બંધ થઈ જશે જ્યાં સુધી તમે તેને પાવર બંધ કરીને ફરીથી ચાલુ ન કરો."</string>
     <string name="language_settings" msgid="8758655933029560944">"ભાષા અને ઇનપુટ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ભાષા અને ઇનપુટ"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ભાષા અને પ્રદેશ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ઇનપુટ અને હાવભાવ"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"કીબોર્ડ અને ઇનપુટ પદ્ધતિઓ"</string>
     <string name="phone_language" msgid="7116581601133118044">"ભાષાઓ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ઉપકરણનો જાગૃત સમય"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ચાલુ સમય"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ચાલુ સમય"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ઇતિહાસ વિગતો"</string>
     <string name="details_title" msgid="3792801565213935385">"વિગતોનો ઉપયોગ કરો"</string>
     <string name="details_subtitle" msgid="32593908269911734">"વિગતોનો ઉપયોગ કરો"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ફોન નિષ્ક્રિય"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"વિવિધ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"અધિક-ગણના કરેલ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU કુલ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU અગ્રભૂમિ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"જાગૃત રહો"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"કુલ વપરાશ"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ખલેલ પાડશો નહીં ઍક્સેસ કરો"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ચૅનલ્સ"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"આ ઍપ્લિએક્શને કોઈ સૂચનાઓ પોસ્ટ કરી નથી"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (કાઢી નાખેલ)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"તમામને અવરોધિત કરો"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ઍપ્લિકેશનો ઇન્સ્ટૉલ થયેલ નથી"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનો"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ સંચાલક દ્વારા સંચાલિત કરવામાં આવી રહ્યું છે"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"એકાઉન્ટ્સ"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"ગોઠવો"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"એકાઉન્ટ ડેટા સ્વતઃ સમન્વયન"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"વ્યક્તિગત એકાઉન્ટ ડેટા સ્વતઃ સમન્વયન"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ea56e0e..0c3e2e6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"सुरक्षा"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्ड"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"पोर्टेबल हॉटस्‍पॉट"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ टेदरिंग"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदरिंग"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"टेदरिंग और पोर्टेबल हॉटस्‍पॉट"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू होने के दौरान टेदर नहीं किया जा सकता या पोर्टेबल हॉटस्पॉट का उपयोग नहीं किया जा सकता"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदरिंग"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके फ़ोन की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
     <string name="language_settings" msgid="8758655933029560944">"भाषाएं और इनपुट"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषाएं और इनपुट"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"भाषा और क्षेत्र"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"इनपुट और हावभाव"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट पद्धति"</string>
     <string name="phone_language" msgid="7116581601133118044">"भाषाएं"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"डिवाइस सक्रियण समय"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरण"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणों का उपयोग करें"</string>
     <string name="details_subtitle" msgid="32593908269911734">"विवरणों का उपयोग करें"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन निष्‍क्रिय"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"विविध"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"अत्यधिक"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"कुल उपयोग"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान ना करें ऐक्सेस"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप द्वारा परेशान ना करें ऐक्सेस का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"चैनल"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"इस ऐप्लिकेशन ने कोई भी नोटिफ़िकेशन पोस्ट नहीं किया है"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (हटाया गया)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"इंस्टॉल नहीं किए गए ऐप्‍लिकेशन"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"खाते"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फ़िगर करें"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"खाता डेटा स्वतः सिंक करें"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"निजी खाता डेटा स्वतः सिंक करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f02e5e9..4f64ad9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -331,7 +331,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sigurnost"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
@@ -1267,7 +1268,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijen. pristupna točka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetoothom veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje veze i žarišna točka"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je Ušteda podataka uključena, ne možete upotrebljavati modemsko povezivanje ni prijenosne žarišne točke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB-om"</string>
@@ -1608,8 +1610,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke značajke vašeg telefona mogu prestati raditi ispravno dok ga ne isključite i ponovo ne uključite."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Jezici i regija"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Unos i pokreti"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tipkovnica i načini unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1861,6 +1861,8 @@
     <string name="awake" msgid="387122265874485088">"Vrijeme budnosti uređaja"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vrijeme"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vrijeme"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalji povijesti"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalji upotrebe"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalji upotrebe"</string>
@@ -1877,6 +1879,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Previše obračunato"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži u aktivnom stanju"</string>
@@ -1928,6 +1938,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Korišteno %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kod posljednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno iskorištenje"</string>
@@ -2436,6 +2448,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2721,7 +2735,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nijednu obavijest"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (izbrisano)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
@@ -3343,7 +3360,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacije nisu instalirane"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vašom pohranom sada upravlja upravitelj pohrane"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Računi"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriranje"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autom. sink. podataka o računu"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autom. sink. osobnog računa"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8ecb107..3f48218 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Fiókok"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Fiókok"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Biztonság"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hordozható hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth megosztása"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Megosztás"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Megosztás és hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Ha az Adatforgalom-csökkentő be van kapcsolva, nem lehet használni az internetmegosztás és a hordozható hotspot funkciókat"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB megosztás"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ha leállítja ezt a szolgáltatást, telefonjának néhány funkciója hibásan működhet, amíg ki, majd újra be nem kapcsolja azt."</string>
     <string name="language_settings" msgid="8758655933029560944">"Nyelvek és bevitel"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Nyelvek és bevitel"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Nyelvek és régió"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Bevitel és kézmozdulatok"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Billentyűzet- és beviteli módok"</string>
     <string name="phone_language" msgid="7116581601133118044">"Nyelvek"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Eszköz készenléti ideje"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi időben"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi időben"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Előzmények részletei"</string>
     <string name="details_title" msgid="3792801565213935385">"Használat részletei"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Használat részletei"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Egyéb"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Túlbecsült"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Használat időtartama: %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> az utolsó töltés óta"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Töltés nélkül eltöltött idő: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Használat összesen"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ne zavarjanak” elérés"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Egy telepített alkalmazás sem kért „Ne zavarjanak” elérést"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Csatornák"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ez az alkalmazás nem küldött semmilyen értesítést"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (törölve)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Az alkalmazások nincsenek telepítve"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Telepített alkalmazások"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tárhelyét mostantól a tárhelykezelő kezeli"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Fiókok"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurálás"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Fiókadat-szinkronizálás"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Személyesfiók-szinkronizálás"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9aaa3e8..612d0e6 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Անվտանգություն"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Գաղտնաբառեր"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Դյուրակիր թեժ կետ"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-ը կապվում է"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Միացում"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Միացում և շարժական թեժ կետ"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Երբ թրաֆիկի խնայումն ակտիվ է, հնարավոր չէ կապել կամ օգտագործել շարժական հասանելիության կետերը"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB միացում"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Եթե դուք կասեցնեք այս ծառայությունը, հեռախոսի որոշ հատկություններ կարող են դադարել ճիշտ գործել, մինչև այն չանջատեք և վերամիացնեք:"</string>
     <string name="language_settings" msgid="8758655933029560944">"Լեզուներ և ներածում"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Լեզուներ և ներածում"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Լեզուներ և տարածաշրջան"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Ներածում և ժեստեր"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ստեղնաշար և մուտքագրման եղանակներ"</string>
     <string name="phone_language" msgid="7116581601133118044">"Լեզուներ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Սարքի արթնանալու ժամանակը"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ժամանակին"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi-ը ժամանակին"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Պատմության մանրամասները"</string>
     <string name="details_title" msgid="3792801565213935385">"Օգտագործման մանրամասները"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Օգտագործման մանրամասները"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Սպասման ռեժիմ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Զանազան"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Գերօգտագործում"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ի ընդհանուրը"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Արթուն պահել"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ընդհանուր օգտագործումը"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Հասանելիությունը՝ «չանհանգստացնել»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Ալիքներ"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Այս հավելվածը ծանուցումներ չի փակցրել"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ջնջված)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Հավելվածները տեղադրված չեն"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Տեղադրված հավելվածներ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ձեր սարքի հիշողությունն այժմ կառավարվում է հիշողության կառավարիչի կողմից"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Հաշիվներ"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Կարգավորում"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Ինքնահամաժամել հաշվի տվյալները"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Ինքնահամաժամել անձնական հաշվի տվյալները"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6b31ef6..512a2b2 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Keamanan"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabel"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Menambatkan"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Menambatkan &amp; hotspot portabel"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak dapat tethering atau menggunakan hotspot portabel saat Penghemat Data aktif"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jika Anda menghentikan layanan ini, beberapa fitur ponsel mungkin tidak bekerja dengan semestinya sampai Anda mematikan dan menyalakannya lagi."</string>
     <string name="language_settings" msgid="8758655933029560944">"Bahasa &amp; masukan"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Bahasa &amp; masukan"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Bahasa &amp; wilayah"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Masukan &amp; isyarat"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; metode masukan"</string>
     <string name="phone_language" msgid="7116581601133118044">"Bahasa"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Waktu bangun perangkat"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi berdasarkan waktu"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi berdasarkan waktu"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detail riwayat"</string>
     <string name="details_title" msgid="3792801565213935385">"Detail penggunaan"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detail penggunaan"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Lain-Lain"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Dihitung berlebih"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Tetap aktif"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Digunakan selama %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ketika terakhir dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total penggunaan"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Saluran"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Aplikasi ini belum memposting notifikasi"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (dihapus)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikasi tidak terpasang"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikasi terpasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Penyimpanan kini dikelola oleh pengelola penyimpanan"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Akun"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurasikan"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinkron otomatis data akun"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinkron otomatis data akun pribadi"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 83d5fa0..0634f36 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Reikningar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Öryggi"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Aðgangsorð"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Heitur reitur"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tjóðrun"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tjóðrun"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tjóðrun og heitur reitur"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Ekki er hægt að tjóðra eða nota heita reiti á meðan kveikt er á gagnasparnaði"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tjóðrun"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ef þú stöðvar þessa þjónustu getur verið að einhverjir eiginleikar símans hætti að virka rétt þar til þú slekkur á honum og kveikir á honum aftur."</string>
     <string name="language_settings" msgid="8758655933029560944">"Tungumál og inntak"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tungumál og inntak"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Tungumál og svæði"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Inntak og bendingar"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Lyklaborð og innsláttaraðferðir"</string>
     <string name="phone_language" msgid="7116581601133118044">"Tungumál"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Vökutími tækis"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi tími"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi tími"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Upplýsingar um notkun"</string>
     <string name="details_title" msgid="3792801565213935385">"Notkunarupplýsingar"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Notkunarupplýsingar"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Sími aðgerðalaus"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Ýmislegt"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Oftalið"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Örgjörvi samtals"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Örgjörvi í forgrunni"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Halda vakandi"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Notað í %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> síðan tekið var úr sambandi"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Frá síðustu hleðslu í <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Heildarnotkun"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ónáðið ekki“ aðgangur"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Engin uppsett forrit hafa óskað eftir „Ónáðið ekki“ aðgangi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Rásir"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Þetta forrit hefur ekki birt neinar tilkynningar"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (eytt)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Forrit ekki uppsett"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Uppsett forrit"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Geymslurýminu þínu er nú stjórnað af geymslustjórnun"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Reikningar"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Stilla"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Samst. reikningsg. sjálfkrafa"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Samst. einkareikng. sjálfkr."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3208a91..f2ac864 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sicurezza"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portatile"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering/hotspot portatile"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossibile eseguire il tethering o utilizzare hotspot portatili con Risparmio dati attivo"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se interrompi questo servizio, potrebbero verificarsi anomalie in alcune funzioni del telefono fino allo spegnimento e alla riaccensione del telefono."</string>
     <string name="language_settings" msgid="8758655933029560944">"Lingue e immissione"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Lingue e immissione"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Lingue e paese"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Immissione e gesti"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastiera e metodi di immissione"</string>
     <string name="phone_language" msgid="7116581601133118044">"Lingue"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo accensione Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo accensione Wi‑Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Dettagli cronologia"</string>
     <string name="details_title" msgid="3792801565213935385">"Dettagli di utilizzo"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Varie"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Sovrastimato"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Usata per %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante ultimo scollegamento per <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totali utilizzo"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesso Non disturbare"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canali"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"L\'app non ha pubblicato alcuna notifica"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (eliminato)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"App non installate"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"App installate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Il tuo spazio di archiviazione è ora gestito dalla Gestione memoria"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Account"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurazione"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sincr. automatica dati account"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sincr. automat. dati account pers."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6e72c67..7c456df 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"חשבונות"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
     <string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"אבטחה"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"‏הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"נקודה לשיתוף אינטרנט"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"‏שיתוף אינטרנט דרך Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"שיתוף אינטרנט בין ניידים"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"נקודה לשיתוף אינטרנט"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"‏לא ניתן לשתף אינטרנט בין ניידים או להשתמש בנקודה ניידת לשיתוף אינטרנט כשחוסך הנתונים (Data Saver) פועל."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏שיתוף אינטרנט דרך USB"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"אם תפסיק שירות זה, תכונות מסוימות של הטלפון עלולות להפסיק לפעול כהלכה עד לכיבוי המכשיר והפעלתו מחדש."</string>
     <string name="language_settings" msgid="8758655933029560944">"שפות וקלט"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"שפות וקלט"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"שפות ואזור"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"קלט ותנועות"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"מקלדת ושיטות קלט"</string>
     <string name="phone_language" msgid="7116581601133118044">"שפות"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"זמן פעולה של מכשיר"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi בזמן"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi בזמן"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"פרטי היסטוריה"</string>
     <string name="details_title" msgid="3792801565213935385">"פרטי שימוש"</string>
     <string name="details_subtitle" msgid="32593908269911734">"פרטי שימוש"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"טלפון לא פעיל"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"שונות"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"חישוב יתר"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU - סך הכל"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU בחזית"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"שמור במצב פעיל"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"נתוני שימוש כוללים"</string>
@@ -2459,6 +2471,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2746,7 +2760,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ערוצים"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"האפליקציה הזו לא שלחה התראות"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (נמחק)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
@@ -3380,7 +3397,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"אפליקציות לא מותקנות"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"חשבונות"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"הגדרה"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"סנכרון אוטומטי לנתוני החשבון"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"סנכרון אוט\' לנתוני חשבון פרטי"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f39f5bb..3c0b381 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"アカウント"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置情報"</string>
     <string name="account_settings_title" msgid="626177544686329806">"アカウント"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"セキュリティ"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ポータブルアクセスポイント"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothテザリング"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"テザリング"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"テザリングとポータブルアクセスポイント"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"データセーバーが ON のときは、テザリングやポータブル アクセス ポイントを使用できません"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USBテザリング"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"このサービスを停止すると、電源を一旦OFFにして再度ONにするまで、モバイル端末の一部の機能が正常に動作しなくなる場合があります。"</string>
     <string name="language_settings" msgid="8758655933029560944">"言語と入力"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"言語と入力"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"言語と地域"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"入力と操作"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"キーボードと入力方法"</string>
     <string name="phone_language" msgid="7116581601133118044">"言語"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-FiをONにしている時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-FiをONにしている時間"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"履歴の詳細"</string>
     <string name="details_title" msgid="3792801565213935385">"使用状況の詳細"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用状況の詳細"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"アイドル状態"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"その他"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"過剰算出"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU合計"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"合計使用量"</string>
@@ -2419,6 +2431,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2702,7 +2716,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"マナーモードへのアクセス"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"マナーモードへのアクセスをリクエストしたインストール済みアプリはありません"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"チャンネル"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"このアプリの通知はありません"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g>(削除済み)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"すべてブロック"</string>
@@ -3312,7 +3329,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"アプリがインストールされていません"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"インストール済みアプリ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"お使いのストレージの管理はストレージ マネージャが行うようになりました"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"アカウント"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"設定"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"アカウント データを自動同期"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"個人用アカウント データを自動同期"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 53a9d64..19e7fc7 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ანგარიშები"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"მდებარეობა"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ანგარიშები"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"უსაფრთხოება"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"პაროლები"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"პორტატული უსადენო ქსელი"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-მოდემი"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"მოდემის რეჟიმი"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"მოდემი და პორტატული უსადენო ქსელი"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ტეტერინგის ან პორტატული უსადენო ქსელის გამოყენება ვერ მოხერხდება, როცა მონაცემთა დამზოგველი ჩართულია"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB მოდემი"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"სერვისის გაჩერების შემთხვევაში, ტელეფონის მომდევნო სრულ გადატვირთვამდე შესაძლოა ზოგმა ფუნქციამ შეცდომებით იმუშაოს."</string>
     <string name="language_settings" msgid="8758655933029560944">"ენები და შეყვანა"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ენები და შეყვანა"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ენები და რეგიონი"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"შეყვანა და ჟესტები"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"კლავიატურა და შეყვანის მეთოდები"</string>
     <string name="phone_language" msgid="7116581601133118044">"ენები"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"მოწყობილობის ღვიძილის დრო"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-ს მუშაობის დრო"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi მუშაობის დრო"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ისტორიის დეტალები"</string>
     <string name="details_title" msgid="3792801565213935385">"ბატარეის გამოყენების დეტალები"</string>
     <string name="details_subtitle" msgid="32593908269911734">"გამოყენების დეტალები"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"მოცდის რეჟიმი"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"სხვადასხვა"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ზედმეტად ჩათვლილი"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"სულ ცენრალურ პროცესორში"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU აქტიური რეჟიმი"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"დარჩეს აქტიური"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"სულ გამოყენებული"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„არ შემაწუხოთ“ წვდომა"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"დაუინსტალირებელმა აპებმა მოითხოვა „არ შემაწუხოთ“ წვდომა"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"არხები"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ამ აპს შეტყობინებები არ გამოუქვეყნებია"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (წაიშალა)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ყველას დაბლოკვა"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"დაუინსტალირებული აპები"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"დაინსტალირებული აპები"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"თქვენს მეხსიერებას ახლა მეხსიერების მენეჯერი მართავს"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"ანგარიშები"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"კონფიგურაცია"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ანგარიშის მონაცემების ავტოსინქრონიზაცია"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"პირადი ანგარიშის მონაცემების ავტოსინქრონიზაცია"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 6f04bfd..076e73f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Қауіпсіздік"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Құпия сөздер"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Алынбалы хот-спот"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth модем"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Тетеринг"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Тетеринг және алынбалы хотспот"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Data Saver функциясы қосулы кезде, тетерингті немесе тасымалы хот-спотты пайдалану мүмкін емес"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем режимі"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Бұл қызметті тоқтатсаңыз телефонның кейбір функциялары телефонды өшіріп, қайта қосқанша дұрыс жұмыс істемеуі мүмкін."</string>
     <string name="language_settings" msgid="8758655933029560944">"Тілдер және енгізу"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Тілдер және енгізу"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Тіл және аймақ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Енгізу және қимылдар"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Пернетақта және енгізу әдістері"</string>
     <string name="phone_language" msgid="7116581601133118044">"Тілдер"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Құрылғыны ояту уақыты"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi уақытында"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi уақытында"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Тарих егжей-тегжейі"</string>
     <string name="details_title" msgid="3792801565213935385">"Егжей-тегжейлі ақпаратты қолдану"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Қолдану деректері"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Күту режимі"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Әр түрлі"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Артық есептелген"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Барлық CPU (орталық өңдеу бірлігі)"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (орталық процессор) алғы шебі"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ұйқы бермеу"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Барлық қолданысы"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Мазаламау режиміне кіру"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Арналар"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Бұл қолданба ешқандай хабарландыруды жарияламады"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (жойылған)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығына тыйым салу"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Орнатылмаған қолданбалар"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнатылған қолданбалар"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Құрылғы жадын енді жад менеджері басқарады"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Есептік жазбалар"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Конфигурациялау"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Есептік жазба деректерін автоматты синхрондау"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Жеке есептік жазба деректерін автоматты синхрондау"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 3c09a43..c53d0ff 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"សុវត្ថិភាព"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ពាក្យ​សម្ងាត់"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ហតស្ពត​ចល័ត"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ការ​ភ្ជាប់ប៊្លូធូស"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ការ​ភ្ជាប់"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ការ​ភ្ជាប់ &amp; ហតស្ពត​ចល័ត"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"មិនអាចភ្ជាប់ ឬប្រើហតស្ពតចល័តបានទេ នៅពេលបើកកម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
     <string name="usb_title" msgid="7483344855356312510">"យូអេសប៊ី"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ការ​ភ្ជាប់​តាម​យូអេសប៊ី"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"បើ​អ្នក​បញ្ឈប់​សេវាកម្ម​នេះ លក្ខណៈ​មួយ​ចំនួន​នៃ​ទូរស័ព្ទ​របស់​អ្នក​អាច​លែង​ដំណើរការ​តាម​ត្រឹមត្រូវ លុះ​ត្រា​តែ​អ្នក​បិទ ហើយ​បើក​វា​ឡើងវិញ។"</string>
     <string name="language_settings" msgid="8758655933029560944">"ភាសា និងធាតុចូល"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ភាសា និងធាតុចូល"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ភាសា &amp; តំបន់"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ធាតុបញ្ចូល &amp; កាយវិការ"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ក្ដារ​ចុច &amp; វិធី​សាស្ត្រ​បញ្ចូល"</string>
     <string name="phone_language" msgid="7116581601133118044">"ភាសា"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ពេលវេលា​ភ្ញាក់​របស់​ឧបករណ៍"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ពេលវេលា​​បើក​វ៉ាយហ្វាយ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ពេលវេលា​បើក​វ៉ាយហ្វាយ"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ព័ត៌មាន​លម្អិត​ប្រវត្តិ"</string>
     <string name="details_title" msgid="3792801565213935385">"ព័ត៌មាន​លម្អិត​ការ​ប្រើ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ព័ត៌មាន​លម្អិត​នៃការ​ប្រើ"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ផ្សេងៗ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"លើស​"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"មិន​ដេក"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ការ​ប្រើ​សរុប"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ចូលដំណើរមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ប៉ុស្តិ៍"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"កម្មវិធី​នេះ​មិន​បាន​បង្ហោះ​ការជូនដំណឹង​ណាមួយ​ឡើយ"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (បានលុប)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"រារាំងទាំងអស់"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"មិនបានដំឡើងកម្មវិធីទេ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"កម្មវិធី​បាន​ដំឡើង"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"នៅពេលនេះទំហំផ្ទុករបស់អ្នកត្រូវបានគ្រប់គ្រងដោយកម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"គណនី"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"កំណត់រចនាសម្ព័ន្ធ"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ធ្វើសមកាលកម្មទិន្នន័យគណនីដោយស្វ័យប្រវត្តិ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ធ្វើសមកាលកម្មទិន្នន័យគណនីផ្ទាល់ខ្លួនដោយស្វ័យប្រវត្តិ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 997d8a0..c2c7915 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಾನ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"ಭದ್ರತೆ"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ಪೋರ್ಟಬಲ್ ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ಬ್ಲೂಟೂತ್‌‌ ಟೆಥರಿಂಗ್‌"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ಟೆಥರಿಂಗ್‌"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ಟೆಥರಿಂಗ್ &amp; ಪೋರ್ಟಬಲ್ ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ಡೇಟಾ ಉಳಿಸುವಿಕೆಯನ್ನು ಆನ್ ಆಗಿರುವಾಗ ಪೋರ್ಟೆಬಲ್ ಹಾಟ್‌ಸ್ಪಾಟ್‌ಗಳನ್ನು ಟೆಥರ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ ಅಥವಾ ಬಳಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ಟೆಥರಿಂಗ್"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ನೀವು ಈ ಸೇವೆಯನ್ನು ನಿಲ್ಲಿಸಿದರೆ, ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಆಫ್‌ ಮಾಡಿ ಹಾಗೂ ನಂತರ ಮತ್ತೆ ಆನ್‌ ಮಾಡುವವರೆಗೆ ಅದರ ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳು ಸದ್ಯಕ್ಕೆ ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಬಹುದು."</string>
     <string name="language_settings" msgid="8758655933029560944">"ಭಾಷೆಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ಭಾಷೆಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ಭಾಷೆಗಳು ಮತ್ತು ಪ್ರದೇಶ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ಇನ್‌ಪುಟ್ ಮತ್ತು ಸನ್ನೆಗಳು"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ಕೀಬೋರ್ಡ್‌ &amp; ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳು"</string>
     <string name="phone_language" msgid="7116581601133118044">"ಭಾಷೆಗಳು"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ಸಾಧನ ಎಚ್ಚರಗೊಂಡ ಸಮಯ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ಸಮಯದಲ್ಲಿ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ಸಮಯದಲ್ಲಿ"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ಇತಿಹಾಸದ ವಿವರಗಳು"</string>
     <string name="details_title" msgid="3792801565213935385">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ಫೋನ್‌ ತಟಸ್ಥ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ಇತರೆ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ಅಧಿಕ ಗಣನೆ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ಮೊತ್ತ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ಮುನ್ನೆಲೆ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ಎಚ್ಚರವಾಗಿಡಿ"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ಬಳಕೆಯ ಮೊತ್ತ"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಯಾವುದೇ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶ ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ಚಾನಲ್‌ಗಳು"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಪೋಸ್ಟ್‌ ಮಾಡಿಲ್ಲ"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ಅಳಿಸಲಾಗಿದೆ)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ಎಲ್ಲವನ್ನೂ ನಿರ್ಬಂಧಿಸು"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ನಿಮ್ಮ ಸಂಗ್ರಹಣೆಯು ಈಗ ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ವಹಿಸಿಲಾಗುತ್ತಿದೆ"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"ಖಾತೆಗಳು"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ಸ್ವಯಂ-ಸಿಂಕ್ ಖಾತೆಯ ಡೇಟಾ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ಸ್ವಯಂ-ಸಿಂಕ್ ವೈಯಕ್ತಿಕ ಖಾತೆ ಡೇಟಾ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 21a2d04..888a3e1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"계정"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"위치"</string>
     <string name="account_settings_title" msgid="626177544686329806">"계정"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"휴대용 핫스팟"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"블루투스 테더링"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"테더링"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"테더링 및 휴대용 핫스팟"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"데이터 절약 모드가 켜져 있으면 테더링하거나 휴대용 핫스팟을 사용할 수 없습니다."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 테더링"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"이 서비스를 중지하면 휴대전화의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
     <string name="language_settings" msgid="8758655933029560944">"언어 및 입력"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"언어 및 입력"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"언어 &amp; 지역"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"입력 &amp; 동작"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"키보드 및 입력 방법"</string>
     <string name="phone_language" msgid="7116581601133118044">"언어"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"장치 무중단 가동 시간"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 사용 시간"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 사용 시간"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"기록 세부정보"</string>
     <string name="details_title" msgid="3792801565213935385">"사용 세부정보"</string>
     <string name="details_subtitle" msgid="32593908269911734">"사용 세부정보"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"기타"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"과다 산정됨"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"총 사용량"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"알림 일시중지 액세스"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"설치된 앱 중에서 알림 일시중지 액세스를 요청한 앱이 없습니다."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"채널"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"이 앱에서 게시한 알림이 없음"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g>(삭제됨)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"앱이 설치되어 있지 않음"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"설치된 앱"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"현재 저장용량 관리자가 저장용량을 관리하고 있습니다."</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"계정"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"설정"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"계정 데이터 자동 동기화"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"개인 계정 데이터 자동 동기화"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 8b82056..0e2ecdc 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -328,7 +328,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Каттоо эсептери"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Жайгашкан жер"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Каттоо эсептери"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Коопсуздук"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Жайгашкан жеримди, экран кулпусун ачууну, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Сырсөздөр"</string>
@@ -1256,7 +1257,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ташыма кошулуу чекити"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth жалгаштыруу"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Жалгаштыруу"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Жалгаштыруу жана ташыма чекит"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Дайындарды үнөмдөгүч режиминде түзмөктү модем же көчмө туташуу түйүнү катары колдонуу мүмкүн эмес"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB жалгаштыруу"</string>
@@ -1596,8 +1598,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Бул кызматты токтотсоңуз, телефонуңузду өчүрүп, кайра жандырмайынча, анын кээ бир мүмкүнчүлүктөрү туура эмес иштеп калышы мүмкүн."</string>
     <string name="language_settings" msgid="8758655933029560944">"Тилдер жана киргизүү ыкмасы"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Тилдер жана киргизүү ыкмасы"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Тил жана аймактар"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Киргизүү жана жаңсоолор"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Тергич жана киргизүү ыкмалары"</string>
     <string name="phone_language" msgid="7116581601133118044">"Тилдер"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1843,6 +1843,8 @@
     <string name="awake" msgid="387122265874485088">"Түзмөк ойгоо турган убакыт"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi өз учурунда"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Өз убагындагы Wi‑Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Таржымалдын чоо-жайы"</string>
     <string name="details_title" msgid="3792801565213935385">"Чоо-жайын колдонуу"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Чоо-жайын колдонуу"</string>
@@ -1859,6 +1861,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефондун сенек учуру"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Калган-каткандар"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Ашыкча эсептелген"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Жалпы CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Алдыңкы фондогу CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ойгоо кармоо"</string>
@@ -1910,6 +1920,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Жалпы колдонулушу"</string>
@@ -2414,6 +2426,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2697,7 +2711,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясын пайдалануу"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Каналдар"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Бул колдонмо эч кандай эскертме берген жок"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (жок кылынган)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
@@ -3307,7 +3324,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Колдонмолор орнотулган эмес"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнотулган колдонмолор"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Каттоо эсептери"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Конфигурациялоо"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Аккаунтту авто-шайкештештирүү"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Жеке аккаунтту авто-шайкешт."</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index d5b6063..783ced1 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ບັນຊີ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ສະຖານທີ່"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ບັນຊີ"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"ຄວາມ​ປອດ​ໄພ"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ລະ​ຫັດ​ຜ່ານ"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ຮັອດສະປອດເຄື່ອນທີ່"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ປ່ອຍສັນຍານຜ່ານ Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ການປ່ອຍສັນຍານ"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ການປ່ອຍສັນຍານ &amp; ຮັອດສະປອດເຄື່ອນທີ່"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ບໍ່ສາມາດປ່ອຍສັນຍານ ຫຼື ໃຊ້ຮັອດສະປອດເຄື່ອນທີ່ໃນຂະນະທີ່ເປີດຕົວປະຢັດຂໍ້ມູນໄດ້"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ການປ່ອຍສັນຍານດ້ວຍ USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ຫາກທ່ານຢຸດບໍລິການນີ້ ບາງຄຸນສົມບັດຂອງໂທລະສັບທ່ານອາດເຮັດວຽກໄດ້ບໍ່ຖືກຕ້ອງ ຈົນກວ່າທ່ານຈະປິດແລ້ວເປີດໃໝ່ໃໝ່ອີກຄັ້ງ."</string>
     <string name="language_settings" msgid="8758655933029560944">"ພາສາ ແລະ ການປ້ອນຂໍ້ມູນ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ພາສາ ແລະ ການປ້ອນຂໍ້ມູນ"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ພາສາ ແລະ ເຂດແດນ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ການປ້ອນຂໍ້ມູນ ແລະ ທ່າທາງ"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ແປ້ນພິມ &amp; ວິທີປ້ອນຂໍ້ມູນເຂົ້າ"</string>
     <string name="phone_language" msgid="7116581601133118044">"ພາ​ສາ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ເວລາການເຮັດວຽກຂອງອຸປະກອນ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ເວລາເປີດໃຊ້ Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ໄລຍະເວລາການໃຊ້ Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ລາຍລະອຽດປະຫວັດການນຳໃຊ້"</string>
     <string name="details_title" msgid="3792801565213935385">"ໃຊ້ລາຍລະອຽດ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ໃຊ້ລາຍລະອຽດ"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ໂທລະ​ສັບ​ບໍ່​ເຮັດ​ວຽກ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ອື່ນໆ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ຄິດໄລ່ເກີນ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ຮວມ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ເຮັດວຽກຕະຫຼອດເວລາ"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ໃຊ້ທັງໝົດ"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ​ຫາ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ບໍ່​ມີ​ການ​ຂໍ​ແອັບ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້ ​ຫາ​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ຊ່ອງ"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (deleted)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ບ​ລັອກ​ທັງ​ໝົດ"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ແອັບຯທີ່ຕິດຕັ້ງແລ້ວ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ຕອນນີ້ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນແລ້ວ."</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"ບັນຊີ"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"ຕັ້ງຄ່າ"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ຊິ້ງຂໍ້ມູນບັນຊີອັດຕະໂນມັດ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ຊິ້ງຂໍ້ມູນບັນຊີສ່ວນຕົວອັດຕະໂນມັດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3c36805..c9ef375 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Paskyros"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sauga"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, prisijungimo duomenų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Perkeliama aktyvioji sritis"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"„Bluetooth“ susiejimas"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Susiejimas"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Susiej. ir perk. vieš. int. pr. tašk."</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Negalima naudoti įrenginio kaip modemo arba viešosios interneto prieigos taškų, kai įjungta Duomenų taupymo priemonė"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB susiejimas"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jei sustabdysite šią paslaugą, kai kurios telefono funkcijos gali tinkamai nebeveikti, kol jį išjungsite ir vėl įjungsite."</string>
     <string name="language_settings" msgid="8758655933029560944">"Kalbos ir įvestis"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Kalbos ir įvestis"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Kalbos ir regionas"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Įvestis ir gestai"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klaviatūra ir įvesties metodai"</string>
     <string name="phone_language" msgid="7116581601133118044">"Kalbos"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Įrenginio veikimo laikas"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"„Wi-Fi“ laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"„Wi-Fi“ laiku"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Istorijos informacija"</string>
     <string name="details_title" msgid="3792801565213935385">"Išsami naudojimo informacija"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Išsami naudojimo informacija"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Įvairus"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Per daug apskaičiuota"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neužmigdyti"</string>
@@ -1945,6 +1955,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Naudota %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kai paskutinį kartą buvo ištrauktas iš lizdo <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Visas naudojimas"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanalai"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ši programa nepaskelbė jokių pranešimų"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ištrintas)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
@@ -3380,7 +3397,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Programos neįdiegtos"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Įdiegtos programos"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Saugyklą dabar tvarko saugyklos valdytojas"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Paskyros"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigūruoti"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autom. sinchr. pask. duomenis"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Aut. sinchr. asm. pask. duom."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2579dfb..a97ab60 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -331,7 +331,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Atrašanās vieta"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Drošība"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
@@ -1267,7 +1268,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Pārnēsājams tīklājs"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth saistīšana"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Saistīšana"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Piesaiste un pārn. tīklājs"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kamēr ir ieslēgts datu lietojuma samazinātājs, nevar veikt piesaisti vai izmantot pārnēsājamus tīklājus"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB piesaiste"</string>
@@ -1608,8 +1610,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ja apturēsiet šī pakalpojuma darbību, dažas tālruņa funkcijas var nedarboties pareizi līdz brīdim, kad tālrunis tiks izslēgts un atkal ieslēgts."</string>
     <string name="language_settings" msgid="8758655933029560944">"Valodas un ievade"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Valodas un ievade"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Valodas un reģions"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Ievade un žesti"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatūra un ievades metodes"</string>
     <string name="phone_language" msgid="7116581601133118044">"Valodas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1861,6 +1861,8 @@
     <string name="awake" msgid="387122265874485088">"Ierīces nomoda laiks"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi uz laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi uz laiku"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Vēstures dati"</string>
     <string name="details_title" msgid="3792801565213935385">"Lietojuma dati"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Izmantot detaļas"</string>
@@ -1877,6 +1879,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Dažādi"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Par daudz uzskaitītais"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neļaut pāriet miega rež."</string>
@@ -1928,6 +1938,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kopš atslēgšanas"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pēdējās atslēgšanas laikā <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kopējais patēriņš"</string>
@@ -2436,6 +2448,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2721,7 +2735,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Piekļuve pie “Netraucēt”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve režīmam “Netraucēt”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanāli"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Šai lietotnei nav neviena paziņojuma."</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (izdzēsts)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
@@ -3343,7 +3360,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Lietotnes nav instalētas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalētās lietotnes"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tagad jūsu krātuvi pārvalda krātuves pārvaldnieks"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Konti"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurācija"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autom. sinhronizēt konta datus"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Aut. sinhr. pers. konta datus"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 76bf57e..cdefe88 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Постави „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Постави „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинки"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Преносл. точка на пристап"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Поврзување со Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Поврзување"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Поврзување и пренослива точка на пристап"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Не може да се врзе или се да користат преносни точки на пристап додека е вклучен Штедачот на интернет"</string>
     <string name="usb_title" msgid="7483344855356312510">"УСБ"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Поврзување со УСБ"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако ја запрете оваа услуга, некои карактеристики на вашиот телефон може да престанат да работат правилно, додека не го исклучите и повторно не го вклучите."</string>
     <string name="language_settings" msgid="8758655933029560944">"Јазици и внесување"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Јазици и внесување"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Јазик и регион"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Пишување и гестови"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Тастатура и методи на внес"</string>
     <string name="phone_language" msgid="7116581601133118044">"Јазици"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Време на активност на уред"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Детали на историја"</string>
     <string name="details_title" msgid="3792801565213935385">"Користи детали"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Користи детали"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон во мирување"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Разно"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Надминато"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Вкупно CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Преден план на CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи активен"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Вкупна употреба"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Пристап до „Не вознемирувај“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Канали"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Апликацијава не објави ниедно известување"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (избришан)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај ги сите"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Апликациите не се инсталирани"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани апликации"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Управникот со меморија сега управува со вашата меморија"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Сметки"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Конфигурирајте"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Автосинхр. податоци за сметка"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Автосинхр. лични податоци"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index f0ecc52..a613b07 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"സുരക്ഷ"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"പാ‌സ്‌വേഡുകൾ"</string>
@@ -518,10 +519,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ഡിസ്മിസ് ചെയ്യുക"</string>
-    <!-- no translation found for lockpassword_password_too_short (2726090378672764986) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_short (3638188874397727648) -->
-    <skip />
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> പ്രതീകങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"പിൻ നമ്പറിൽ കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> അക്കങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"തുടരുക"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"പാസ്‌വേഡ്, <xliff:g id="NUMBER">%d</xliff:g> പ്രതീകങ്ങളേക്കാൾ കുറവായിരിക്കണം."</string>
     <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"<xliff:g id="NUMBER">%d</xliff:g> അക്കങ്ങളേക്കാൾ കുറവായിരിക്കണം."</string>
@@ -531,12 +530,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"കുറഞ്ഞത് ഒരു അക്ഷരമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"കുറഞ്ഞത് ഒരു അക്കമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"കുറഞ്ഞത് ഒരു ചിഹ്നമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
-    <!-- no translation found for lockpassword_password_requires_letters (9013132344745898400) -->
-    <!-- no translation found for lockpassword_password_requires_lowercase (2626327674921055486) -->
-    <!-- no translation found for lockpassword_password_requires_uppercase (7860796359913920356) -->
-    <!-- no translation found for lockpassword_password_requires_numeric (1967587658356336828) -->
-    <!-- no translation found for lockpassword_password_requires_symbols (6751305770863640574) -->
-    <!-- no translation found for lockpassword_password_requires_nonletter (4440596998172043055) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="other">കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> അക്ഷരങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+      <item quantity="one">കുറഞ്ഞത് ഒരു അക്ഷരമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="other">കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> ചെറിയക്ഷരങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+      <item quantity="one">കുറഞ്ഞത് ഒരു ചെറിയക്ഷരമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="other">കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> വലിയക്ഷരങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+      <item quantity="one">കുറഞ്ഞത് ഒരു വലിയക്ഷരമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="other">കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> അക്കങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+      <item quantity="one">കുറഞ്ഞത് ഒരു അക്കമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="other">കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> സവിശേഷ ചിഹ്നങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+      <item quantity="one">കുറഞ്ഞത് ഒരു സവിശേഷ ചിഹ്നമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="other">കുറഞ്ഞത് അക്ഷരമല്ലാത്ത <xliff:g id="COUNT">%d</xliff:g> പ്രതീകങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+      <item quantity="one">കുറഞ്ഞത് അക്ഷരമല്ലാത്ത ഒരു പ്രതീകമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"ഒരു സമീപകാല പാസ്‌വേഡ് ഉപയോഗിക്കാൻ ഉപകരണ അഡ്‌മിനിസ്‌ട്രേറ്റർ അനുവദിക്കുന്നില്ല."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"സംഖ്യകളുടെ ആരോഹണമോ അവരോഹണമോ ആവർത്തിക്കുന്ന അനുക്രമമോ നിരോധിച്ചിരിക്കുന്നു"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ശരി"</string>
@@ -1241,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"പോർട്ടബിൾ ഹോട്ട്സ്‌പോട്ട്"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ബ്ലൂടൂത്ത് ടെതറിംഗ്"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ടെതറിംഗ്"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ടെതറിംഗും പോർട്ടബിൾ ഹോട്ട്സ്‌പോട്ടും"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ഡാറ്റ സേവർ ഓണായിരിക്കുന്ന സമയത്ത് പോർട്ടബിൾ ഹോട്ട്സ്പോട്ടുകൾ ടെതർ ചെയ്യാനോ ഉപയോഗിക്കാനോ കഴിയില്ല"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ടെതറിംഗ്"</string>
@@ -1581,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"നിങ്ങൾ ഈ സേവനം നിർത്തുകയാണെങ്കിൽ, നിങ്ങളുടെ ഫോൺ ഓഫാക്കി വീണ്ടും ഓണാക്കുന്നതുവരെ അതിലെ ചില സവിശേഷതകൾ ശരിയായി പ്രവർത്തിക്കുന്നത് അവസാനിപ്പിക്കാനിടയുണ്ട്."</string>
     <string name="language_settings" msgid="8758655933029560944">"ഭാഷകളും ഇൻപുട്ടും"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ഭാഷകളും ഇൻപുട്ടും"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ഭാഷകളും മേഖലയും"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ഇൻപുട്ടും ജെസ്റ്ററുകളും"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"കീബോർഡും ടൈപ്പുചെയ്യൽ രീതികളും"</string>
     <string name="phone_language" msgid="7116581601133118044">"ഭാഷകൾ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1828,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ഉപകരണം സജീവമായ സമയം"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"വൈഫൈ ഓൺ ടൈം"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"വൈഫൈ ഓൺ ടൈം"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ചരിത്ര വിശദാംശം"</string>
     <string name="details_title" msgid="3792801565213935385">"വിശദാംശം ഉപയോഗിക്കൂ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"വിശദാംശം ഉപയോഗിക്കൂ"</string>
@@ -1844,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ഫോൺ നിഷ്‌ക്രിയ സമയം"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"പലവക"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"കണക്കാക്കി"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"മൊത്തം CPU ഉപയോഗം"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ഫോർഗ്രൗണ്ട്"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"സജീവമായി തുടരുക"</string>
@@ -1895,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ആകെ ഉപയോഗങ്ങൾ"</string>
@@ -2399,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2682,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്സ്"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ചാനലുകൾ"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ഈ ആപ്പ് അറിയിപ്പുകളൊന്നും പോസ്‌റ്റുചെയ്‌തിട്ടില്ല"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ഇല്ലാതാക്കി)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
@@ -3292,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ഇൻസ്‌റ്റാളുചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"നിങ്ങളുടെ സ്റ്റോറേജ് ഇപ്പോൾ മാനേജുചെയ്യുന്നത് സ്റ്റോറേജ് ​​മാനേജരാണ്"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"അക്കൗണ്ടുകൾ"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"ക്രമീകരിക്കുക"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"അക്കൗണ്ട് വിവരങ്ങൾ സ്വയമേവ സമന്വയിപ്പിക്കുക"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"വ്യക്തിഗത അക്കൗണ്ട് വിവരങ്ങൾ സ്വയമേവ സമന്വയിപ്പിക്കുക"</string>
@@ -3358,10 +3392,8 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ഓഫ്"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ഓൺ"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ഗെയിമുകള്‍"</string>
-    <!-- no translation found for audio_files_title (4777048870657911307) -->
-    <skip />
-    <!-- no translation found for audio_storage_title (5494923634269236874) -->
-    <skip />
+    <string name="audio_files_title" msgid="4777048870657911307">"ഓഡിയോ ഫയലുകള്‍‌"</string>
+    <string name="audio_storage_title" msgid="5494923634269236874">"സംഗീതം"</string>
     <string name="webview_uninstalled_for_user" msgid="2088190546280992258">"<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് അണ്‍ഇൻസ്റ്റാള്‍ ചെയ്തു\n"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് പ്രവർത്തനരഹിതമാക്കി\n"</string>
     <string name="autofill_app" msgid="3889348218462883960">"സ്വയമേവ പൂരിപ്പിക്കുന്ന ആപ്പ്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 665254a..7c838e9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Бүртгэл"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Байршил"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Бүртгэл"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Аюулгүй байдал"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Нууц үг"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Зөөврийн сүлжээний цэг"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth модем болгох"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Модем болгох"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Модем болгох &amp; зөөврийн сүлжээний цэг"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Өгөгдөл хамгаалагчийг асаалттай үед зөөврийн сүлжээний цэгийг ашиглах болон модем болгох боломжгүй"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем болгох"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Хэрэв та энэ үйлчилгээг зогсоовол утсаа унтраагаад асаахаас нааш таны утасны зарим функцууд зөв ажиллахаа больж магадгүй."</string>
     <string name="language_settings" msgid="8758655933029560944">"Хэл, оролт"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Хэл, оролт"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Хэл, бүс нутаг"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Оролт, зангаа"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Гар &amp; оруулах аргууд"</string>
     <string name="phone_language" msgid="7116581601133118044">"Хэл"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Төхөөрөмжийн идэвхтэй байх хугацаа"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi цагтаа"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi цагтаа"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Түүхийн мэдээлэл"</string>
     <string name="details_title" msgid="3792801565213935385">"Ашиглалтын мэдээлэл"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Ашиглалтын мэдээлэл"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Утас идэвхгүй"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Бусад"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Хэтрүүлэн тооцсон"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU нийт"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Сэрүүн байлгах"</string>
@@ -1913,6 +1923,8 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_used_for (4383512863007718804) -->
     <skip />
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Нийт ашиглалт"</string>
@@ -2417,6 +2429,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Бүү саад бол\" хандалт"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Суулгасан апп-аас \"Бүү саад бол\" хандалтыг хүссэн апп байхгүй байна."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Суваг"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Энэ апп ямар ч мэдэгдэл нийтлээгүй"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (устгасан)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Бүгдийг блокло"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Апп суулгаагүй байна"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Суулгасан апп"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Таны санг одоо сангийн менежер удирдаж байна"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Бүртгэл"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Хэлбэрт оруулах"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Бүртгэлийн өгөгдлийг автоматаар синк хийх"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Хувийн бүртгэлийн өгөгдлийг автоматаар синк хийх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 6890f34..cae1e5e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"सुरक्षितता"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"संकेतशब्द"</string>
@@ -518,10 +519,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"आपण या प्रयत्नात चुकीचा कार्य संकेतशब्द प्रविष्ट केल्यास, आपले कार्य प्रोफाईल आणि संबद्ध डेटा या डिव्हाइस वरून काढला जाईल."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"बरेच चुकीचे प्रयत्न. आपले कार्य प्रोफाईल आणि संबद्ध डेटा या डिव्हाइस वरून काढला जाईल."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"डिसमिस करा"</string>
-    <!-- no translation found for lockpassword_password_too_short (2726090378672764986) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_short (3638188874397727648) -->
-    <skip />
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"किमान <xliff:g id="COUNT">%d</xliff:g> वर्ण असणे आवश्यक आहे"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"पिन किमान <xliff:g id="COUNT">%d</xliff:g> अंकी असणे आवश्यक आहे"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"सुरु ठेवा"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"<xliff:g id="NUMBER">%d</xliff:g> वर्णांपेक्षा कमीचा असावा."</string>
     <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"<xliff:g id="NUMBER">%d</xliff:g> अंकांपेक्षा कमी असणे आवश्यक आहे."</string>
@@ -531,12 +530,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"कमीत कमी एक अक्षर असणे आवश्यक आहे"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"कमीत कमी एक अंक असणे आवश्यक आहे"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"कमीत कमी एक चिन्ह असणे आवश्यक आहे"</string>
-    <!-- no translation found for lockpassword_password_requires_letters (9013132344745898400) -->
-    <!-- no translation found for lockpassword_password_requires_lowercase (2626327674921055486) -->
-    <!-- no translation found for lockpassword_password_requires_uppercase (7860796359913920356) -->
-    <!-- no translation found for lockpassword_password_requires_numeric (1967587658356336828) -->
-    <!-- no translation found for lockpassword_password_requires_symbols (6751305770863640574) -->
-    <!-- no translation found for lockpassword_password_requires_nonletter (4440596998172043055) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षरे असणे आवश्यक आहे</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> लोअरकेस अक्षर असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> लोअरकेस अक्षरे असणे आवश्यक आहे</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अप्परकेस अक्षर असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अप्परकेस अक्षरे असणे आवश्यक आहे</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> संख्यात्मक अंक असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> संख्यात्मक अंक असणे आवश्यक आहे</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष चिन्ह असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष चिन्हे असणे आवश्यक आहे</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर नसलेला वर्ण असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर नसलेले वर्ण असणे आवश्यक आहे</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"डिव्हाइस प्रशासक अलीकडील संकेतशब्द वापरण्याची अनुमती देत नाही."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"चढत्या, उतरत्या किंवा अंकांचा पुनरावृत्ती क्रम निषिद्ध आहे"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक"</string>
@@ -1241,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"पोर्टेबल हॉटस्पॉट"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटुथ टेदरिंग"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टिथरिंग"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"टेदरिंग आणि पोर्टेबल हॉटस्पॉट"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू असताना टिथर करू शकत नाही किंवा पोर्टेबल हॉटस्पॉटचा वापर करू शकत नाही"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदरिंग"</string>
@@ -1581,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"आपण ही सेवा थांबविल्यास, आपण तीचा पॉवर बंद करून पुन्हा चालू करेपर्यंत आपल्या टॅब्लेटची काही वैशिष्ट्ये योग्यरितीने कार्य करणे थांबवू शकतात."</string>
     <string name="language_settings" msgid="8758655933029560944">"भाषा आणि इनपुट"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषा आणि इनपुट"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"भाषा आणि प्रदेश"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"इनपुट आणि जेश्चर"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड आणि इनपुट पद्धती"</string>
     <string name="phone_language" msgid="7116581601133118044">"भाषा"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1828,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"डिव्हाइस सक्रिय होण्याची वेळ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"वाय-फाय चालू केल्याची वेळ"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास तपशील"</string>
     <string name="details_title" msgid="3792801565213935385">"तपशील वापरा"</string>
     <string name="details_subtitle" msgid="32593908269911734">"तपशील वापरा"</string>
@@ -1844,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"फोन निष्क्रिय"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"संकीर्ण"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"जास्त प्रमाणात"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU एकूण"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रस्थान"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सक्रिय ठेवा"</string>
@@ -1895,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"वापर एकूण"</string>
@@ -2399,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2682,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कोणत्याही स्थापित केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करीत आहे..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"चॅनेल"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"या अॅपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (हटवलेले)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सर्व अवरोधित करा"</string>
@@ -3292,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"अ‍ॅप्स स्थापित केलेले नाहीत"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"स्थापित केलेले अॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपला संचय आता संचय व्यवस्थापक व्यवस्थापित करीत आहे"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"खाती"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"खाते डेटा स्वयं संकालित करा"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"वैयक्तिक खाते डेटा स्वयं संकालित करा"</string>
@@ -3358,10 +3392,8 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
-    <!-- no translation found for audio_files_title (4777048870657911307) -->
-    <skip />
-    <!-- no translation found for audio_storage_title (5494923634269236874) -->
-    <skip />
+    <string name="audio_files_title" msgid="4777048870657911307">"ऑडिओ फायली"</string>
+    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="2088190546280992258">"<xliff:g id="USER">%s</xliff:g> वापरकर्त्यासाठी विस्थापित केले\n"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"<xliff:g id="USER">%s</xliff:g> वापरकर्त्यासाठी अक्षम केले\n"</string>
     <string name="autofill_app" msgid="3889348218462883960">"स्वयं-भरण अॅप"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b397250..8ae8c47 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaun"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Keselamatan"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Titik panas mudah alih"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Penambatan"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Liputan tambatan &amp; mudah alih"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak boleh menambat atau menggunakan tempat liputan mudah alih semasa Penjimat Data dihidupkan"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jika anda menghentikan perkhidmatan ini, beberapa ciri telefon anda boleh berhenti berfungsi dengan betul sehingga anda mematikannya dan kemudian menghidupkannya semula."</string>
     <string name="language_settings" msgid="8758655933029560944">"Bahasa &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Bahasa &amp; input"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Bahasa &amp; rantau"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Input &amp; gerak isyarat"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Papan kekunci &amp; kaedah input"</string>
     <string name="phone_language" msgid="7116581601133118044">"Bahasa"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Waktu jaga peranti"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Masa hidup Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Masa hidup Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Butiran sejarah"</string>
     <string name="details_title" msgid="3792801565213935385">"Butiran penggunaan"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Butiran penggunaan"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Pelbagai"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Terlebih kira"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Kekal berjaga"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Semasa kali terakhir palam dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumlah penggunaan"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tiada sebarang apl yang terpasang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Saluran"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Apl ini belum menyiarkan sebarang pemberitahuan"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (dipadamkan)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apl tidak dipasang"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apl yang dipasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Storan anda kini diurus oleh pengurus storan"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Akaun"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurasikan"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autosegerak data akaun"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autosegerak data akaun peribadi"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 444a4e5..6871505 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"လုံခြုံရေး"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"စကားဝှက်များ"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ရွေ့လျားနိုင်သောဟော့စပေါ့"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ဘလူးတုသ်တဆင့်ပြန်ချိတ်ဆက်"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"တဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"တဆင့်ချိတ်ဆက်ခြင်း၊ ဟော့စပေါ့"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ဒေတာချွေတာမှုစနစ် ဖွင့်ထားစဉ်တွင် ထုတ်လွှင့်၍မရပါ သို့မဟုတ် ရွှေ့ပြောင်းဟော့စပေါ့ကို အသုံးပြု၍မရပါ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"အကယ်၍ဤဝန်ဆောင်မှုကိုရပ်ဆိုင်းလျှင် သင့်ဖုန်း၏အချို့သောလုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ပြီး နောက်တခါပြန်လည်ဖွင့်သည့်အထိ ကောင်းစွာအလုပ်လုပ်မည်မဟုတ်ပါ"</string>
     <string name="language_settings" msgid="8758655933029560944">"ဘာသာစကား &amp; ထည့်သွင်းစနစ်"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ဘာသာစကား &amp; ထည့်သွင်းစနစ်"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ဘာသာစကားများနှင့် နယ်မြေဒေသ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"စာရိုက်စနစ်နှင့် ဟန်များ"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ကီးဘုတ်နှင့်ထည့်သွင်းရန်နည်းလမ်းများ"</string>
     <string name="phone_language" msgid="7116581601133118044">"ဘာသာစကားများ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"စက်အား ဖွင့်မည့်အချိန်"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"အချိန်ကိုက်ဝိုင်ဖိုင်"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"အချိန်ကိုက်ဝိုင်ဖိုင်"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"မှတ်တမ်းအသေးစိတ်များ"</string>
     <string name="details_title" msgid="3792801565213935385">"အသေးစိတ်ကို အသုံးပြုမှု"</string>
     <string name="details_subtitle" msgid="32593908269911734">"အသေးစိတ် အသုံးပြုခြင်း"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ဖုန်းအားမသုံးသည့်အခါ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"အထွေထွေ အကြောင်းအရာများ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"အပိုရေတွက်မှု"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"စုစုပေါင်းCPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUအနီးမြင်ကွင်း"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ဖွင့်လျှက်ထားရှိရန်"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"အသုံးပြုမှု စုစုပေါင်း"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"မနှောင့်ယှက်ရန် အသုံးပြုခြင်း"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"အက်ပ်များကို တင်နေ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ချန်နယ်များ"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ဤအက်ပ်က မည်သည့် အကြောင်းကြားချက်ကိုမျှ ပို့စ်တင်မထားပါ"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ဖျက်လိုက်ပါပြီ)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"အားလုံးကို ပိတ်ဆို့ရန်။"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"အက်ပ်များကို ထည့်သွင်းမထားပါ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ထည့်သွင်းထားသည့် အက်ပ်များ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"သင့်သိုလှောင်မှုကို သိုလှောင်မှုမန်နေဂျာက လက်ရှိစီမံခန့်ခွဲနေပါသည်"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"အကောင့်များ"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"စီစဉ်သတ်မှတ်ပါ"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"အကောင့်ဒေတာ အော်တိုစင့်ခ်လုပ်ပါ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ကိုယ်ပိုင်အကောင့်ဒေတာ အော်တိုစင့်ခ်လုပ်ပါ"</string>
@@ -3375,7 +3393,7 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ဖွင့်ထားသည်"</string>
     <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="audio_storage_title" msgid="5494923634269236874">"ဂီတ"</string>
     <string name="webview_uninstalled_for_user" msgid="2088190546280992258">"<xliff:g id="USER">%s</xliff:g> အသုံးပြုသူအတွက် ဖြုတ်ထားပါသည်\n"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"<xliff:g id="USER">%s</xliff:g> အသုံးပြုသူအတွက် ပိတ်ထားသည်\n"</string>
     <string name="autofill_app" msgid="3889348218462883960">"အလိုအလျောက် ဖြည့်စွက်ခြင်းအက်ပ်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8a4626c..fd5b4e0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontoer"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Posisjon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhet"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Flyttbar trådløs sone"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-internettdeling"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internettdeling"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Nettdeling og trådløs sone"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan ikke bruke internettdeling eller flyttbare Wi-Fi-soner mens Datasparing er på"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-internettdeling"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Hvis du stopper denne tjenesten, kan noen av funksjonene i telefonen din slutte å virke slik de skal inntil du slår den av og deretter på igjen."</string>
     <string name="language_settings" msgid="8758655933029560944">"Språk og inndata"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Språk og inndata"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Språk og område"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Inndata og bevegelser"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatur og inndatametoder"</string>
     <string name="phone_language" msgid="7116581601133118044">"Språk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi – aktivt i"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi – aktivt i"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Loggdetaljer"</string>
     <string name="details_title" msgid="3792801565213935385">"Bruksdetaljer"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Overberegnet"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total bruk"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanaler"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Denne appen har ikke publisert noen varsler"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (slettet)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apper som ikke er installert"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerte apper"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Lagringsplassen din blir nå administrert av lagringsadministratoren"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Kontoer"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurer"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autosynk. av kontodata"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autosynk. av pers. kontodata"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 84be26a..612b556 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाताहरू"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाताहरू"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"सुरक्षा"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्डहरू"</string>
@@ -518,10 +519,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"तपाईंले यो प्रयासमा गलत कार्य पासवर्ड प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"धेरै पकट गलत प्रयास गरियो। तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"खारेज गर्नुहोस्"</string>
-    <!-- no translation found for lockpassword_password_too_short (2726090378672764986) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_short (3638188874397727648) -->
-    <skip />
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा वर्ण हुनु अनिवार्य छ"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> अङ्कको हुनु अनिवार्य छ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी राख्नुहोस्"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"<xliff:g id="NUMBER">%d</xliff:g> भन्दा कम वर्णहरू हुनुपर्दछ।"</string>
     <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"<xliff:g id="NUMBER">%d</xliff:g> भन्दा थोरै अङ्क हुनुपर्छ।"</string>
@@ -531,12 +530,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"कम्तीमा एउटा अक्षर हुन अनिवार्य छ"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"कम्तीमा एउटा अङ्क हुन अनिवार्य छ"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"कम्तीमा एउटा प्रतीक हुन अनिवार्य छ"</string>
-    <!-- no translation found for lockpassword_password_requires_letters (9013132344745898400) -->
-    <!-- no translation found for lockpassword_password_requires_lowercase (2626327674921055486) -->
-    <!-- no translation found for lockpassword_password_requires_uppercase (7860796359913920356) -->
-    <!-- no translation found for lockpassword_password_requires_numeric (1967587658356336828) -->
-    <!-- no translation found for lockpassword_password_requires_symbols (6751305770863640574) -->
-    <!-- no translation found for lockpassword_password_requires_nonletter (4440596998172043055) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="other">कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा अक्षर हुनु अनिवार्य छ</item>
+      <item quantity="one">कम्तीमा पनि एउटा अक्षर हुनु अनिवार्य छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="other">कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा साना अक्षर हुनु अनिवार्य छ</item>
+      <item quantity="one">कम्तीमा पनि एउटा सानो अक्षर हुनु अनिवार्य छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="other">कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा ठूला अक्षर हुनु अनिवार्य छ</item>
+      <item quantity="one">कम्तीमा पनि एउटा ठूलो अक्षर हुनु अनिवार्य छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="other">कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा संख्यात्मक अङ्क हुनु अनिवार्य छ</item>
+      <item quantity="one">कम्तीमा पनि एउटा संख्यात्मक अङ्क हुनु अनिवार्य छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="other">कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा विशेष प्रतीक हुनु अनिवार्य छ</item>
+      <item quantity="one">कम्तीमा पनि एउटा विशेष प्रतीक हुनु अनिवार्य छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="other">कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा गैर-अक्षर वर्ण हुनु अनिवार्य छ</item>
+      <item quantity="one">कम्तीमा पनि एउटा गैर-अक्षर वर्ण हुनु अनिवार्य छ</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"उपकरण प्रशासकले हालसालको पासवर्ड प्रयोग गर्न अनुमति दिदैन।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"बढ्दो, घट्दो वा अंकको बारम्बार अनुक्रम निषेध गरिएको छ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक छ"</string>
@@ -1241,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"पोर्टेबल हटस्पट"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लुटुथ टेथर गर्दै"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदर गर्दै"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"टेदर गर्ने र पोर्टेबल हटस्पट"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा सेभर अन हुँदा टेदरिङ वा पोर्टेबल हटस्पटहरूको प्रयोग गर्न सक्दैन"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदर गर्दै"</string>
@@ -1581,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि तपाईँले यस सेवालाई बन्द गर्नु भएको खण्डमा तपाईँको फोनका केही सुविधाहरू सही तवरले काम गर्न बन्द गर्न सक्छन् तबसम्म तपाईँले फेरि यसलाई पावर बन्द गरी फेरि सुरु गर्नु हुन्न।"</string>
     <string name="language_settings" msgid="8758655933029560944">"भाषा र इनपुट"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषा र इनपुट"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"भाषा र क्षेत्र"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"इनपुट र इसाराहरू"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"किबोर्ड र इनपुट विधिहरू"</string>
     <string name="phone_language" msgid="7116581601133118044">"भाषाहरू"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1828,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"उपकरण जाग्ने समय"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"समयमा Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"समयमा Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरणहरू"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणहरू प्रयोग गर्नुहोस्"</string>
     <string name="details_subtitle" msgid="32593908269911734">"विवरणहरू प्रयोग गर्नुहोस्"</string>
@@ -1844,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"निष्क्रिय फोन"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"विविध"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"बढी गिन्ती"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU कुल"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभूमि"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"जागा रहनुहोस्"</string>
@@ -1895,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"उपयोग कूलहरू"</string>
@@ -2399,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2682,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"पहुँचमा बाधा नपुर्‍यानुहोस्"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कुनै पनि स्थापित अनुप्रयोगहरू द्वारा पहुँचमा बाधा नपुर्‍यानुहोस् को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"च्यानलहरू"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (मेटाइयो)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सबै रोक्नुहोस्"</string>
@@ -3294,7 +3327,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"अनुप्रयोगहरूको स्थापना गरिएको छैन"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"स्थापना गरिएका अनुप्रयोगहरू"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तपाईंको भण्डारण अहिले भण्डारण प्रबन्धकद्वारा व्यवस्थापन भइरहेको छ"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"खाताहरू"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"कन्फिगर गर्नुहोस्"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"खाताको डेटा स्वतः सिंक गर्नुहोस्"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"व्यक्तिगत खाताको डेटा स्वतः सिंक गर्नुहोस्"</string>
@@ -3360,10 +3394,8 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"निष्क्रिय"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"सक्रिय"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"खेलहरू"</string>
-    <!-- no translation found for audio_files_title (4777048870657911307) -->
-    <skip />
-    <!-- no translation found for audio_storage_title (5494923634269236874) -->
-    <skip />
+    <string name="audio_files_title" msgid="4777048870657911307">"अडियो फाइलहरू"</string>
+    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="2088190546280992258">"प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि स्थापना रद्द गरियो\n"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो\n"</string>
     <string name="autofill_app" msgid="3889348218462883960">"स्वत: भरण अनुप्रयोग"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index eeeb47d..adc7f22 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locatie"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Beveiliging"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"\'Mijn locatie\', schermontgrendeling, SIM- en certificaatopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, certificaatopslag vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Draagbare hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering en draagbare hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan niet tetheren of draagbare hotspots gebruiken terwijl Databesparing is ingeschakeld"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tethering"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Als je deze service stopt, werken bepaalde functies van je telefoon mogelijk pas weer correct nadat je de telefoon hebt uitgeschakeld en weer ingeschakeld."</string>
     <string name="language_settings" msgid="8758655933029560944">"Talen en invoer"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Talen en invoer"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Talen en regio"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Invoer en gebaren"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Toetsenbord en invoermethoden"</string>
     <string name="phone_language" msgid="7116581601133118044">"Talen"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wifi op tijd"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wifi op tijd"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Geschiedenisdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Gebruiksdetails"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diversen"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Te hoog berekend"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s gebruikt"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sinds laatst losgekoppeld voor <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotalen"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot \'Niet storen\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Er zijn geen geïnstalleerde apps die toegang tot \'Niet storen\' hebben aangevraagd"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanalen"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Deze app heeft geen meldingen geplaatst"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (verwijderd)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps niet geïnstalleerd"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Je opslag wordt nu beheerd door de opslagbeheerder"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configureren"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Accountgegevens autom. synchr."</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Persoonl. accountgeg. auto-synchr."</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index e287d7b..33f4e5d 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ਖਾਤੇ"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"ਸੁਰੱਖਿਆ"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, SIM ਕਾਰਡ ਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ਪਾਸਵਰਡ"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ਟੀਥਰਿੰਗ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ਟੀਥਰਿੰਗ"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ਟੀਥਰਿੰਗ &amp; ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਣ \'ਤੇ ਟੀਥਰ ਜਾਂ ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ਟੀਥਰਿੰਗ"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਫੋਨ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="language_settings" msgid="8758655933029560944">"ਭਾਸ਼ਾਵਾਂ ਅਤੇ ਇਨਪੁੱਟ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ਭਾਸ਼ਾਵਾਂ ਅਤੇ ਇਨਪੁੱਟ"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ਭਾਸ਼ਾਵਾਂ ਅਤੇ ਖੇਤਰ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ਇਨਪੁੱਟ ਅਤੇ ਸੰਕੇਤ"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ਕੀ-ਬੋਰਡ &amp; ਇਨਪੁਟ ਵਿਧੀਆਂ"</string>
     <string name="phone_language" msgid="7116581601133118044">"ਭਾਸ਼ਾਵਾਂ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"ਡੀਵਾਈਸ ਦਾ ਸਕਿਰਿਆ ਸਮਾਂ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ਇਤਿਹਾਸ ਵੇਰਵੇ"</string>
     <string name="details_title" msgid="3792801565213935385">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ਫੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ਵਿਵਿਧ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ਓਵਰ-ਕਾਉਂਟਿਡ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ਕੁੱਲ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ਫੋਰਗ੍ਰਾਉਂਡ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ਸਕਿਰਿਆ ਰੱਖੋ"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ਕੁੱਲ ਵਰਤੋਂ"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਿਤ ਐਪਸ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ਚੈਨਲ"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ਇਸ ਐਪ ਨੇ ਕੋਈ ਵੀ ਸੂਚਨਾਵਾਂ ਪੋਸਟ ਨਹੀਂ ਕੀਤੀਆਂ ਹਨ"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ਮਿਟਾਇਆ ਗਿਆ)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲੌਕ ਕਰੋ"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ਐਪਾਂ ਸਥਾਪਤ ਨਹੀਂ ਹਨ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਦੁਆਰਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"ਖਾਤੇ"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"ਸੰਰੂਪਣ ਕਰੋ"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ਖਾਤਾ ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ਵਿਅਕਤੀਗਤ ਖਾਤਾ ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 48fef53..4f6cc38 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konta"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokalizacja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konta"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Zabezpieczenia"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Przenośny punkt dostępu"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering przez Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering i punkt dostępu"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nie można korzystać z tetheringu ani przenośnych hotspotów, gdy Oszczędzanie danych jest włączone"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering przez USB"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jeśli zatrzymasz tę usługę, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
     <string name="language_settings" msgid="8758655933029560944">"Języki i metody wprowadzania"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Języki i metody wprowadzania"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Języki i region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Wprowadzanie i gesty"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klawiatura i wprowadzanie tekstu"</string>
     <string name="phone_language" msgid="7116581601133118044">"Języki"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Czas z włączonym Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Czas z wł. Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Historia – szczegóły"</string>
     <string name="details_title" msgid="3792801565213935385">"Szczegóły użycia"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Inne"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Obliczone z nadmiarem"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU łącznie"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymanie aktywności"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Łączne użycie"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostęp do „Nie przeszkadzać”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanały"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ta aplikacja nie opublikowała żadnych powiadomień"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (usunięty)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacje niezainstalowane"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Zainstalowane aplikacje"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pamięcią zarządza teraz menedżer miejsca"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Konta"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguracja"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autosynchronizacja: dane konta"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autosynchronizacja: osobiste"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6a615ee..0c7f665 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ponto de acesso portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering e acesso portátil"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Não é possível vincular ou usar pontos de acesso portáteis enquanto a Economia de dados está ativada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Vínculo USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se você interromper este serviço, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e entrada"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e entrada"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idioma e região"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrada e gestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e métodos de entrada"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Tempo ativo do aparelho"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ativação da rede Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ativação da rede Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalhes de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Usada por %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canais"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Este app não postou nenhuma notificação"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (excluído)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps não instalados"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinc. autom. de dados da conta"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinc. autom. dados pessoais da conta"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fa12153..7b0d0c0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ligação Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ligação ponto a ponto"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partilha de Internet"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Não é possível ligar via telemóvel ou utilizar zonas Wi-Fi portáteis com a Poupança de dados ativada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Associação USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se interromper este serviço, algumas funcionalidades do telemóvel podem deixar de funcionar corretamente até ser desligado e ligado novamente."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e introdução"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introdução"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idiomas e região"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Introdução e gestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e métodos de introdução"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Hora de activação do dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ligação Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ligação Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Utilizar detalhes"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilizada durante %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde a última vez que foi desligado por <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totais de utilização"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhuma aplicação instalada solicitou acesso Não incomodar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canais"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicação não publicou notificações"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (eliminado)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicações não instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicações instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"O seu armazenamento está agora a ser gerido pelo gestor de armazenamento"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinc. autom. os dados da conta"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinc. aut. dados da conta pes."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6a615ee..0c7f665 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ponto de acesso portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering e acesso portátil"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Não é possível vincular ou usar pontos de acesso portáteis enquanto a Economia de dados está ativada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Vínculo USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se você interromper este serviço, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e entrada"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e entrada"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Idioma e região"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Entrada e gestos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e métodos de entrada"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Tempo ativo do aparelho"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ativação da rede Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ativação da rede Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalhes de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Usada por %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canais"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Este app não postou nenhuma notificação"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (excluído)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps não instalados"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinc. autom. de dados da conta"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinc. autom. dados pessoais da conta"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ab8dbac..90699e9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -331,7 +331,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Conturi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locația mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
@@ -1267,7 +1268,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering prin Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering și hotspot portabil"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nu se poate face tethering și nu se pot folosi hotspoturile portabile în timp ce Economizorul de date este activat"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering prin USB"</string>
@@ -1608,8 +1610,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriți acest serviciu, este posibil ca unele funcții ale telefonului să nu mai funcționeze corect decât după ce îl veți închide și redeschide."</string>
     <string name="language_settings" msgid="8758655933029560944">"Limbi și introducerea textului"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Limbi și introducerea textului"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Limbă și regiune"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Introducere de text și gesturi"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatură și introducere de text"</string>
     <string name="phone_language" msgid="7116581601133118044">"Limbi"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1861,6 +1861,8 @@
     <string name="awake" msgid="387122265874485088">"Durată de activitate a dispozitivului"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Timp de funcționare Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Timp de funcționare Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalii istoric"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalii despre utilizare"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalii despre utilizare"</string>
@@ -1877,6 +1879,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Supraevaluat"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Păstrare în activitate"</string>
@@ -1928,6 +1938,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"S-a utilizat %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> de la deconectare"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"De la ultima deconectare pentru <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totaluri privind utilizarea"</string>
@@ -2436,6 +2448,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2721,7 +2735,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesul Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Canale"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Această aplicație nu a postat nicio notificare"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (șters)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
@@ -3343,7 +3360,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicații neinstalate"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicații instalate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Spațiul de stocare este acum gestionat de managerul spațiului de stocare"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Conturi"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Configurați"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinc. aut. date cont"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinc. aut. date personale cont"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1821de3..d183a22 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Аккаунты"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Аккаунты"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Безопасность"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Точка доступа Wi-Fi"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-модем"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Режим модема"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Режим модема"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"В режиме экономии трафика нельзя подключаться к точкам доступа"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-модем"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Отключение этой системной службы может повлиять на функциональность телефона. Чтобы восстановить работу устройства, потребуется перезагрузить его."</string>
     <string name="language_settings" msgid="8758655933029560944">"Язык и ввод"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Язык и ввод"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Язык и страна"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Ввод и жесты"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Клавиатура и способы ввода"</string>
     <string name="phone_language" msgid="7116581601133118044">"Языки"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Время работы Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Время работы Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Подробная история"</string>
     <string name="details_title" msgid="3792801565213935385">"Расход батареи"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Другое"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Переучтенное"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Акт. режим"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Всего"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ к функции \"Не беспокоить\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установленные приложения не требуют доступа к функции \"Не беспокоить\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Каналы"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Для этого приложения нет уведомлений."</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (удалено)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Приложения не установлены"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установленные приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Память устройства теперь управляется менеджером хранилища"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Аккаунты"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Настройки"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Автосинхронизация аккаунта"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Автосинхр. личного аккаунта"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a697bf1..a5eb4b0 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ස්ථානය"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ගිණුම්"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"ආරක්ෂාව"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"මුරපද"</string>
@@ -697,7 +698,7 @@
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS තල්ලු යතුර"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"තවත් විකල්ප"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN ඇතුලත් කිරීම"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"ඍජු Wi-Fi"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"පරිලෝකනය කරන්න"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"උසස්"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"වින්‍යාස කිරීම"</string>
@@ -714,9 +715,9 @@
     <string name="wifi_show_advanced" msgid="3409422789616520979">"උසස් විකල්ප"</string>
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"පතන ලැයිස්තු උසස් විකල්ප. හැකිළීමට දෙවරක් තට්ටු කරන්න."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"පතන ලැයිස්තු උසස් විකල්ප. දිග හැරීමට දෙවරක් තට්ටු කරන්න."</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi රක්ෂිත පිහිටුම"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS ආරම්භ කරමින්…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"ඔබගේ රවුටරයේ Wi-Fi ආරක්ෂිත පිහිටුම් බොත්තම ඔබන්න. එය \"WPS\" ලෙස හඳුන්වා තිබීමට හෝ මෙම සංකේතය සමගින් සලකුණු කර තිබීමට හැකිය:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"ඔබගේ රවුටරයේ Wi-Fi Protected Setup බොත්තම ඔබන්න. එය \"WPS\" ලෙස හඳුන්වා තිබීමට හෝ මෙම සංකේතය සමගින් සලකුණු කර තිබීමට හැකිය:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ඔබගේ Wi-Fi රවුටරයේ <xliff:g id="NUMBER">%1$s</xliff:g> PIN එක ඇතුලත් කරන්න. පිහිටුම සම්පූර්ණ වීමට මිනිත්තු 2 ක් දක්වා ගත විය හැක."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS සාර්ථකවිය. ජාලයට සම්බන්ධ වෙමින්…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi ජාලයට සම්බන්ධ වුණි"</string>
@@ -800,7 +801,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"වාහල"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ජාල උපසර්ගයේ දිග"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"ඍජු Wi-Fi"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"උපාංගයේ තොරතුරු"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"මෙම සම්බන්ධතාවය මතක තබාගන්න"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"උපාංග සඳහා සොයන්න"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ජංගම හොට්ස්පොට්"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"බ්ලූටූත් ටෙදරින්"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ටෙදරින්"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"ටෙදරින් සහ සුවහනීය හොට්ස්පොට්"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"දත්ත සුරැකුම ක්‍රියාත්මක විට ටෙදර් කිරීමට හෝ අතේ ගෙන යා හැකි හොට්ස්පොට් භාවිත කිරීමට නොහැකිය"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ටෙදරින්"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ඔබ මෙම සේවාව නැවත්වුවහොත්, ඔබගේ දුරකථනයේ සමහර අංග ඔබ එය බලය අක්‍රිය කර නැවත දමන තුරු නිවැරදිව ක්‍රියා නොකිරීමට හැක."</string>
     <string name="language_settings" msgid="8758655933029560944">"භාෂා සහ ආදානය"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"භාෂා සහ ආදානය"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"භාෂාව සහ කලාපය"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ආදානය සහ ඉංගිත"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"යතුරුපුවරුව සහ ආදාන ආකාර"</string>
     <string name="phone_language" msgid="7116581601133118044">"භාෂා"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"උපාංග අවදි කාලය"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi සක්‍රිය කාලය"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ප්‍රමාද නොවී Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"ඉතිහාස විස්තර"</string>
     <string name="details_title" msgid="3792801565213935385">"විස්තර භාවිත කරන්න"</string>
     <string name="details_subtitle" msgid="32593908269911734">"විස්තර භාවිත කරන්න"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"අක්‍රිය දුරකථනය"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"විවිධාකාර"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"වැඩියෙන් ගණනය කළ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU මුළු ගණන"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"පෙරබිම් CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"අවදිව සිටින්න"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"භාවිත එකතු"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ප්‍රවේශය බාධා නොකරන්න"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ස්ථාපිත යෙදුම් කිසිවක් ප්‍රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"නාලිකා"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"මෙම යෙදුම දැනුම්දීම් කිසිවක් පළ කර නැත"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (මකන ලදී)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"සියල්ල අවහිර කරන්න"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"යෙදුම් ස්ථාපනය කර නැත"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ස්ථාපිත යෙදුම්"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ඔබේ ගබඩාව දැන් ගබඩා කළමනාකරු විසින් පාලනය කරනු ලැබේ"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"ගිණුම්"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"වින්‍යාස කරන්න"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ස්වයං සමමුහුර්ත ගිණුම් දත්ත"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ස්වයං සමමුහු. පුද්. ගිණු. දත්ත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 213bb17..26d3f9b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečenie"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosný prístupový bod"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pripojenie cez Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Zdieľanie dát. pripojenia"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Zdieľané pripojenie a prenosný hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Keď je Šetrič dát zapnutý, nie je možné zdieľať internetové pripojenie ani používať prenosné hotspoty"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Zdieľané pripojenie cez USB"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ak túto službu zastavíte, niektoré funkcie vášho telefónu nemusia fungovať. Ich funkčnosť sa obnoví až po vypnutí telefónu a jeho opätovnom zapnutí."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jazyky a vstup"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jazyky a vstup"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Jazyky a oblasť"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Vstup a gestá"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klávesnica a metódy vstupu"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jazyky"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
     <string name="details_title" msgid="3792801565213935385">"Využitie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Využitie"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Rôzne"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Nadsadená"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pri poslednom odpojení pre <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využitie batérie celkom"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prístup k nastaveniu Nerušiť"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Prístup k nastaveniu Nerušiť si nevyžiadali žiadne nainštalované aplikácie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanály"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Táto aplikácia ešte neposlala žiadne upozornenia"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (odstránené)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Nenainštalované aplikácie"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainštalované aplikácie"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vaše úložisko odteraz riadi správca úložiska"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Účty"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurácia"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Aut. synchronizovať dáta účtu"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Aut. synch. dáta osobného účtu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0e099c4..224190e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Varnost"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna dostopna točka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Internet prek Bluetootha"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internet prek mob. napr."</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Modem/prenosna dost. točka"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dokler je vklopljeno varčevanje s podatki, ni mogoče vzpostaviti povezave z internetom prek mobilnega telefona ali uporabljati prenosnih dostopnih točk."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetna povezava prek USB"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Če ustavite to stgoritev, lahko nekatere funkcije v telefonu nehajo pravilno delovati, dokler ga ne izklopite in znova vklopite."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jeziki in vnos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jeziki in vnos"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Jeziki in regije"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Vnašanje in poteze"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tipkovnica in načini vnosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jeziki"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Čas odklenjenega zaslona"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas z vklopljenim Wi-Fi-jem"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas z vklopljenim Wi-Fi-jem"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti zgodovine"</string>
     <string name="details_title" msgid="3792801565213935385">"Podrobnosti uporabe"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti uporabe"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Preveč šteto"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ohrani odklenjen zaslon"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Po zadnjem odklopu za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Skupna poraba"</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ta aplikacija ni objavila nobenih obvestil"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (izbrisano)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Nenameščene aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nameščene aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Shrambo zdaj upravlja upravitelj shrambe"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Računi"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriranje"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Samod. sinhr. podatkov računa"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sam. sinhr. podat. oseb. rač."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 74230fa..689b49d 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Llogaritë"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Siguria"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Cakto \"Vendndodhjen time\", shkyçjen e ekranit, kyçjen e kartës SIM, kyçjen e hapësirës për ruajtjen e kredencialeve"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Cakto \"Vendndodhja ime\", shkyçjen e ekranit, kyçjen e hapësirës ruajtëse të kredencialeve"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Fjalëkalimet"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona e qasjes e lëvizshme"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ndarje interneti përmes Bluetooth-it"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ndarja e internetit"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Zonë qasjeje dhe ndarjeje interneti"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nuk mund të ndajë internetin ose të përdorë zonat e qasjes në internet kur \"Kursyesi i të dhënave\" është aktiv"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Ndarje përmes USB-së"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Nëse e ndalon këtë shërbim, disa funksione të telefonit tënd mund të mos punojnë më si duhet deri sa ta fikësh dhe më pas ta ndezësh përsëri."</string>
     <string name="language_settings" msgid="8758655933029560944">"Gjuhët dhe të dhënat"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Gjuhët dhe të dhënat"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Gjuhët dhe rajoni"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Hyrja dhe gjestet"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastiera dhe metodat e hyrjes"</string>
     <string name="phone_language" msgid="7116581601133118044">"Gjuhët"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Koha e zgjimit të pajisjes"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Koha e aktivizimit të Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Koha e aktivizimit të Wi‑Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detajet e historikut"</string>
     <string name="details_title" msgid="3792801565213935385">"Përdor detajet"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Përdor detajet"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoni në gjendje joaktive"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Të ndryshme"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Numëruar më shumë sa duhet"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ja në total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-ja në plan të parë"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mbaje të zgjuar"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Përdorur për %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> që kur ka qenë në prizë"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kur ishte në prizë për herë të fundit për <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totalet e përdorimit"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Qasja te \"Mos shqetëso\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanalet"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ky aplikacion nuk ka postuar asnjë njoftim"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (i fshirë)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bllokoji të gjitha"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacionet nuk janë të instaluara"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikacionet e instaluara"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hapësira jote ruajtëse tani po menaxhohet nga menaxheri i hapësirës ruajtëse"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Llogaritë"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguro"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sinkronizo auto. të dhënat"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sinkr. auto. të dhëna personale"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6359330..b9be9b4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -331,7 +331,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Налози"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Налози"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
@@ -1267,7 +1268,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Преносни хотспот"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth привезивање"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Повезивање са интернетом"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Повезивање и преносни хотспот"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Није могуће привезивање нити коришћење преносивих хотспотова док је Уштеда података укључена"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB повезивање"</string>
@@ -1608,8 +1610,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако зауставите ову услугу, неке функције телефона ће можда престати исправно да функционишу док не искључите и поново укључите телефон."</string>
     <string name="language_settings" msgid="8758655933029560944">"Језици и унос"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Језици и унос"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Језици и регион"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Унос и покрети"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Тастатура и методе уноса"</string>
     <string name="phone_language" msgid="7116581601133118044">"Језици"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1861,6 +1861,8 @@
     <string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Детаљи историје"</string>
     <string name="details_title" msgid="3792801565213935385">"Коришћење детаља"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Коришћење детаља"</string>
@@ -1877,6 +1879,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон у мировању"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Разно"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Прекомерно израчуната"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Укупно коришћење процесора"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи ван стања спавања"</string>
@@ -1928,6 +1938,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Укупно коришћено"</string>
@@ -2436,6 +2448,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2721,7 +2735,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Приступ опцији Не узнемиравај"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниједна инсталирана апликација није захтевала приступ опцији Не узнемиравај"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавају се апликације..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Канали"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ова апликација није поставила ниједно обавештење"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (избрисано)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
@@ -3343,7 +3360,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Апликације које нису инсталиране"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталиране апликације"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Меморијским простором сада управља Менаџер меморијског простора"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Налози"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Конфигуришите"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Аутом. синхр. податке са налога"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Аутом. синхр. личне податке са налога"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7e70b65..29de9ce 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konton"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Plats"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konton"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Säkerhet"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfpunkt"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Delning via Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internetdelning"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Internetdelning och surfpunkt"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Det går inte att använda internetdelning eller trådlösa surfzoner när Databesparing är aktiverat."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-sammanlänkning"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Om du avslutar tjänsten kanske vissa funktioner i mobilen inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
     <string name="language_settings" msgid="8758655933029560944">"Språk och inmatning"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Språk och inmatning"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Språk och region"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Inmatning och rörelser"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tangentbord och inmatningsmetoder"</string>
     <string name="phone_language" msgid="7116581601133118044">"Språk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi i tid"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi i tid"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detaljerad historik"</string>
     <string name="details_title" msgid="3792801565213935385">"Förbrukning"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"För högt räknad"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Använd i %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedan senaste bortkoppling <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total förbrukning"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Stör ej-åtkomst"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Inga installerade appar har begärt Stör ej-åtkomst"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanaler"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Den här appen har inte skickat några aviseringar"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (raderad)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Appar som är inte installerade"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerade appar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ditt lagringsutrymme hanteras nu av lagringshanteraren"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Konton"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurera"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Autosynka data i konto"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autosynka data i privat konto"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c7774a2..13b0c0c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Usalama"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Manenosiri"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Intaneti ya kusambazwa"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Shiriki intaneti kwa Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Inazuia"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Kushiriki na kusambaza intaneti"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Haiwezi kusambaza mtandao au kutumia mitandao hewa wakati umewasha Kiokoa Data"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Shiriki intaneti kwa USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ukisitisha huduma hii, baadhi ya vipengele vya simu yako vinaweza kuwacha kufanya kazi kwa usahihi mpaka uizime na kisha uwashe tena."</string>
     <string name="language_settings" msgid="8758655933029560944">"Lugha na uingizaji wa data"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Lugha na uingizaji wa data"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Lugha na eneo"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Vifaa vya kuingiza sauti na ishara"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Kibodi na mbinu za kuingiza hoja"</string>
     <string name="phone_language" msgid="7116581601133118044">"Lugha"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fia kwa wakati unaofaa"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi wakati unaofaa"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Maelezo ya historia"</string>
     <string name="details_title" msgid="3792801565213935385">"Tumia maelezo"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Tumia maelezo"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Wakati simu haitumiki"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Mengineyo"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Hesabu iliyopitiliza"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Hutumika kwa %1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ilipochopolewa mara ya mwisho kwa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumla ya utumiaji"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ufikiaji wa Usinisumbue"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hakuna programu zilizosakinishwa ambazo zimeomba ufikiaji wa Usinisumbue"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Vituo"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Programu hii haijachapisha arifa zozote"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (imefutwa)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Programu hazijasakinishwa"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Programu zilizosakinishwa"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hifadhi yako sasa inasimamiwa na kidhibiti cha hifadhi"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Akaunti"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Weka mipangilio"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Sawazisha kiotomatiki data ya akaunti"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Sawazisha kiotomatiki data ya akaunti binafsi"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index c196d1c..b4f8dde 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"பாதுகாப்பு"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"கடவுச்சொற்கள்"</string>
@@ -518,7 +519,7 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"இந்த முயற்சியில் தவறான பணிக் கடவுச்சொல்லை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"அதிகப்படியான தவறான முயற்சிகள். உங்கள் பணி சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"நிராகரி"</string>
-    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"குறைந்தது <xliff:g id="COUNT">%d</xliff:g> குறிகள் இருக்க வேண்டும்"</string>
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"குறைந்தது <xliff:g id="COUNT">%d</xliff:g> எழுத்துகள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"பின்னானது குறைந்தது <xliff:g id="COUNT">%d</xliff:g> இலக்கங்கள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"தொடர்க"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"<xliff:g id="NUMBER">%d</xliff:g> எழுத்துக்குறிகளை விடக் குறைவாக இருக்க வேண்டும்."</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"போர்ட்டபிள் ஹாட்ஸ்பாட்"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"புளூடூத் டெதெரிங்"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"டெதெரிங்"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"டெதெரிங் &amp; போர்டபிள் ஹாட்ஸ்பாட்"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, இணைக்கவோ போர்ட்டபிள் ஹாட்ஸ்பாட்டுகளைப் பயன்படுத்தவோ முடியாது"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB டெதெரிங்"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"இந்தச் சேவையை நீங்கள் நிறுத்தினால், உங்கள் மொபைலை ஸ்விட்ச் ஆஃப் செய்து ஸ்டார்ட் செய்யும் வரை அதன் அம்சங்களில் சில வேலைசெய்யாமல் போகலாம்."</string>
     <string name="language_settings" msgid="8758655933029560944">"மொழிகள் &amp; உள்ளீடு"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"மொழிகள் &amp; உள்ளீடு"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"மொழிகள் &amp; பகுதி"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"உள்ளீடு &amp; சைகைகள்"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"விசைப்பலகை &amp; உள்ளீட்டு முறைகள்"</string>
     <string name="phone_language" msgid="7116581601133118044">"மொழிகள்"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"சாதனம் விழித்திருக்கும் நேரம்"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"வைஃபை இயக்க நேரம்"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"வைஃபை இயக்க நேரம்"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"வரலாறு விவரங்கள்"</string>
     <string name="details_title" msgid="3792801565213935385">"பயன் விவரம்"</string>
     <string name="details_subtitle" msgid="32593908269911734">"விவரங்களைப் பயன்படுத்து"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"மொபைலின் செயல்படாநிலை"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"இதர அமைப்பு"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU மொத்தம்"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU முன்புறம்"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"எப்போதும் விழிப்பில்"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"பயன்பாட்டின் மொத்தம்"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகல்"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"சேனல்கள்"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"இந்தப் பயன்பாடு எந்த அறிவிப்புகளையும் இடுகையிடவில்லை"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (நீக்கப்பட்டது)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"பயன்பாடுகள் நிறுவப்படவில்லை"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"நிறுவிய பயன்பாடுகள்"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"உங்கள் சேமிப்பகம் இப்போது சேமிப்பக நிர்வாகியால் நிர்வகிக்கப்படுகிறது"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"கணக்குகள்"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"உள்ளமைக்கவும்"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"கணக்குத் தரவைத் தானாக ஒத்திசை"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"சொந்த கணக்கு தரவை தானாக ஒத்திசை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f77b41f..0608047 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"స్థానం"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ఖాతాలు"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"భద్రత"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"పాస్‌వర్డ్‌లు"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"పోర్టబుల్ హాట్‌స్పాట్"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"బ్లూటూత్ టీథరింగ్"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"టీథరింగ్"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"టీథరింగ్ &amp; పోర్టబుల్ హాట్‌స్పాట్"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు టీథర్ చేయలేరు లేదా పోర్టబుల్ హాట్‌స్పాట్‌లను ఉపయోగించలేరు"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB టీథరింగ్"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"మీరు ఈ సేవను ఆపివేస్తే, మీ ఫోన్‌ను పవర్ ఆఫ్ చేసి, మళ్లీ ఆన్ చేసే వరకు అందులోని కొన్ని లక్షణాలు సరిగ్గా పని చేయకపోవచ్చు."</string>
     <string name="language_settings" msgid="8758655933029560944">"భాషలు &amp; ఇన్‌పుట్"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"భాషలు &amp; ఇన్‌పుట్"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"భాషలు &amp; ప్రాంతం"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ఇన్‌పుట్ &amp; సంజ్ఞలు"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"కీబోర్డ్ &amp; ఇన్‌పుట్ పద్ధతులు"</string>
     <string name="phone_language" msgid="7116581601133118044">"భాషలు"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"పరికరం మేల్కొని ఉండాల్సిన సమయం"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ఆన్‌లో ఉండే సమయం"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ఆన్‌లో ఉండే సమయం"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"చరిత్ర వివరాలు"</string>
     <string name="details_title" msgid="3792801565213935385">"వినియోగ వివరాలు"</string>
     <string name="details_subtitle" msgid="32593908269911734">"వినియోగ వివరాలు"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ఫోన్ నిష్క్రియం"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"నానావిధమైనవి"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"అధిక గణన"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU మొత్తం"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ముందుభాగం"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"సక్రియంగా ఉంచండి"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"వినియోగ మొత్తాలు"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు ప్రాప్యత"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ అంతరాయం కలిగించవద్దు ప్రాప్యత అభ్యర్థించలేదు"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ఛానెల్‌లు"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"ఈ అనువర్తనం ఏ నోటిఫికేషన్‌లను పోస్ట్ చేయలేదు"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (తొలగించబడింది)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"అన్నింటినీ బ్లాక్ చేయండి"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ఇన్‌స్టాల్ చేయని అనువర్తనాలు"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"మీ నిల్వ ఇప్పుడు నిల్వ నిర్వాహికి ద్వారా నిర్వహించబడుతోంది"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"ఖాతాలు"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"కాన్ఫిగర్ చేయండి"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ఖాతా డేటా స్వీయ సమకాలీకరణ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"వ్యక్తిగత ఖాతా డేటా స్వీయ సమకాలీకరణ"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b21cf8d..a92d5ce 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"บัญชี"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ตำแหน่ง"</string>
     <string name="account_settings_title" msgid="626177544686329806">"บัญชี"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"ความปลอดภัย"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ฮอตสปอตแบบพกพาได้"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ปล่อยสัญญาณบลูทูธ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"การปล่อยสัญญาณ"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"การปล่อยสัญญาณและฮอตสปอต"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ไม่สามารถเชื่อมต่ออินเทอร์เน็ตผ่านมือถือหรือใช้โหมดฮอตสปอตแบบพกพาขณะที่การประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ปล่อยสัญญาณผ่าน USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"หากคุณหยุดบริการนี้ คุณลักษณะบางอย่างของโทรศัพท์อาจทำงานได้ไม่ถูกต้องจนกว่าคุณปิดจะเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
     <string name="language_settings" msgid="8758655933029560944">"ภาษาและการป้อนข้อมูล"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ภาษาและการป้อนข้อมูล"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"ภาษาและภูมิภาค"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"การป้อนข้อมูลและท่าทางสัมผัส"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"แป้นพิมพ์และวิธีการป้อนข้อมูล"</string>
     <string name="phone_language" msgid="7116581601133118044">"ภาษา"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"เวลาการทำงานของอุปกรณ์"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"เวลาเปิดใช้ WiFi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"เวลาเปิดใช้ WiFi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"รายละเอียดประวัติ"</string>
     <string name="details_title" msgid="3792801565213935385">"ใช้รายละเอียด"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ใช้รายละเอียด"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"เบ็ดเตล็ด"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"คำนวณมากเกินไป"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU รวม"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ทำงานตลอดเวลา"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"ยอดใช้งานรวม"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"ช่อง"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"แอปนี้ไม่ได้โพสต์การแจ้งเตือนใดๆ"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (ลบแล้ว)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ไม่ได้ติดตั้งแอป"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"แอปที่ติดตั้ง"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ตัวจัดการพื้นที่เก็บข้อมูลกำลังจัดการพื้นที่เก็บข้อมูลของคุณ"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"บัญชี"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"กำหนดค่า"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"ซิงค์ข้อมูลบัญชีอัตโนมัติ"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ซิงค์ข้อมูลบัญชีส่วนตัวอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f821736..54613d3 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Mga Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasyon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Mga Account"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable na hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pag-tether ng Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Nagte-tether"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Pag-tether at portable hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Hindi makapag-tether o makagamit ng mga portable hotspot habang naka-on ang Data Saver"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Pag-tether ng USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Kung ihihinto mo ang serbisyong ito, maaaring huminto sa paggana nang tama ang ilang mga tampok ng iyong telepono hanggang sa i-off mo ito at pagkatapos ay i-on muli."</string>
     <string name="language_settings" msgid="8758655933029560944">"Mga wika at input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Mga wika at input"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Mga wika at rehiyon"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Input at mga galaw"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard at mga pamamaraan ng input"</string>
     <string name="phone_language" msgid="7116581601133118044">"Mga Wika"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Device ng oras ng paggising"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na nasa oras"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na nasa oras"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Detalye ng history"</string>
     <string name="details_title" msgid="3792801565213935385">"Mga detalye ng paggamit"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Mga detalye ng paggamit"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrang nakalkula"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Panatilihing bukas"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> mula nang na-unplug"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Habang huling naka-unplug para sa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Mga kabuuan ng paggamit"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Access na Huwag Istorbohin"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Walang mga naka-install na app ang humiling ng access na Huwag Istorbohin"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Mga Channel"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Walang anumang notification para sa app na ito"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (na-delete)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Hindi naka-install ang mga app"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Mga naka-install na app"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pinamamahalaan na ngayon ng storage manager ang iyong storage"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Mga Account"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"I-configure"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"I-auto sync ang account data"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"I-auto sync ang personal account data"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5b48a50..b4e1511 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hesaplar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Konum"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesaplar"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Güvenlik"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
@@ -551,7 +552,7 @@
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
       <item quantity="other">Harf olmayan en az <xliff:g id="COUNT">%d</xliff:g> karakter içermelidir</item>
-      <item quantity="one">Harf olmayan en 1 karakter içermelidir</item>
+      <item quantity="one">Harf olmayan en az 1 karakter içermelidir</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"Cihaz yöneticisi yakın zamanda kullanılan bir şifreye izin vermiyor."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Artan, azalan veya tekrar eden rakam dizisi yasaktır"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Taşınabilir hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering ve taşnblr hotspot"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Veri Tasarrufu açıkken taşınabilir hotspot\'lara bağlanılamaz veya kullanılamaz"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Bu hizmeti durdurursanız, telefonunuzun bazı özellikleri, telefon kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
     <string name="language_settings" msgid="8758655933029560944">"Diller ve giriş"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Diller ve giriş"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Dil ve bölge ayarları"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Giriş ve hareketler"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klavye ve giriş yöntemleri"</string>
     <string name="phone_language" msgid="7116581601133118044">"Diller"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Zamanında Kablosuz"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Zamanında Kablosuz"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Geçmiş ayrıntıları"</string>
     <string name="details_title" msgid="3792801565213935385">"Kullanım ayrıntıları"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Kullanım ayrıntıları"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Çeşitli"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Fazla hesaplandı"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
@@ -1910,7 +1920,9 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Pil kullanımı, güç tüketimini yaklaşık olarak gösterir ve pili harcayan kaynakların hepsini hesaba dahil etmez. Çeşitli kaynaklar adı altında belirtilen değer, hesaplanan yaklaşık güç tüketimi ile pilin gerçek kullanımı arasındaki farktır."</string>
     <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 süreyle kullandı"</string>
+    <string name="battery_used_for" msgid="4383512863007718804">"%1$s kullandı"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <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> için fişten son çekildikten itibaren"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kullanım toplamı"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yüklü hiçbir uygulama Rahatsız Etmeyin erişimi isteğinde bulunmadı"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanallar"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Bu uygulama herhangi bir bildirim yayınlamadı"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (silindi)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Yüklü olmayan uygulamalar"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Yüklü uygulamalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Depolama alanınız artık depolama yöneticisi tarafından yönetiliyor"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Hesaplar"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Yapılandırma"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Hesap verilerini oto. senk. et"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Kişisel hesap verilerini oto. senk. et"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 370a247..cc8bf24 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -333,7 +333,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Облікові записи"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Місцезнаходження"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Облікові записи"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Безпека"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
@@ -1277,7 +1278,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Порт. точка дост."</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Прив\'язка Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Прив\'язка"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Режим модема"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Коли ввімкнено Заощадження трафіку, неможливо ввімкнути режим модема або використовувати портативні точки доступу"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Прив\'язка USB"</string>
@@ -1619,8 +1621,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Якщо припинити роботу цієї служби, деякі функції телефону можуть працювати неправильно, поки живлення не буде вимкнено та знову ввімкнено."</string>
     <string name="language_settings" msgid="8758655933029560944">"Мова та введення"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Мова та введення"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Мови та регіон"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Ввід і жести"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Клавіатура та методи введення"</string>
     <string name="phone_language" msgid="7116581601133118044">"Мови"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1878,6 +1878,8 @@
     <string name="awake" msgid="387122265874485088">"Час активн. пристрою"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Час роботи Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Час роботи Wi-Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Деталі історії"</string>
     <string name="details_title" msgid="3792801565213935385">"Вжиток акумулятора"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Вжиток"</string>
@@ -1894,6 +1896,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим очік."</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Інше"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Переоцінене"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Заг. ЦП"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Залишати активним"</string>
@@ -1945,6 +1955,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"Заг. використ."</string>
@@ -2457,6 +2469,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2744,7 +2758,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не просили доступу в режимі \"Не турбувати\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Канали"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Цей додаток не надсилав сповіщень"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (видалено)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокувати всі"</string>
@@ -3378,7 +3395,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Додатки не встановлено"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установлені додатки"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Зараз пам’яттю керує диспетчер пам’яті"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Облікові записи"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Налаштування"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Автосинхронізувати дані"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Автосинхронізувати особисті дані"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 5941e3d..2672132 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"سیکیورٹی"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"پاس ورڈز"</string>
@@ -518,10 +519,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"اگر آپ نے اس کوشش میں غلط دفتری پاسورڈ داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"بہت زیادہ غلط کوششیں۔ آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"برخاست کریں"</string>
-    <!-- no translation found for lockpassword_password_too_short (2726090378672764986) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_short (3638188874397727648) -->
-    <skip />
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"کم از کم <xliff:g id="COUNT">%d</xliff:g> حروف پر مشتمل ہونا چاہیے"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"‏PIN کم از کم <xliff:g id="COUNT">%d</xliff:g> ہندسوں کا ہونا چاہیے"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"جاری رکھیں"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"کریکٹرز <xliff:g id="NUMBER">%d</xliff:g> سے کم ہونے چاہئیں۔"</string>
     <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"ہندسے <xliff:g id="NUMBER">%d</xliff:g> سے کم ہونے چاہئیں۔"</string>
@@ -531,12 +530,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"کم از کم ایک حرف پر مشتمل ہونا چاہیئے"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"کم از کم ایک ہندسہ پر مشتمل ہونا چاہیے"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"کم از کم ایک علامت پر مشتمل ہونا چاہیے"</string>
-    <!-- no translation found for lockpassword_password_requires_letters (9013132344745898400) -->
-    <!-- no translation found for lockpassword_password_requires_lowercase (2626327674921055486) -->
-    <!-- no translation found for lockpassword_password_requires_uppercase (7860796359913920356) -->
-    <!-- no translation found for lockpassword_password_requires_numeric (1967587658356336828) -->
-    <!-- no translation found for lockpassword_password_requires_symbols (6751305770863640574) -->
-    <!-- no translation found for lockpassword_password_requires_nonletter (4440596998172043055) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="other">کم از کم <xliff:g id="COUNT">%d</xliff:g> حروف پر مشتمل ہونا چاہیے</item>
+      <item quantity="one">کم از کم 1 حرف پر مشتمل ہونا چاہیئے</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="other">کم از کم <xliff:g id="COUNT">%d</xliff:g> چھوٹے حروف پر مشتمل ہونا چاہیے</item>
+      <item quantity="one">کم از کم ایک چھوٹے حرف پر مشتمل ہونا چاہیئے</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="other">کم از کم <xliff:g id="COUNT">%d</xliff:g> بڑے حروف پر مشتمل ہونا چاہیے</item>
+      <item quantity="one">کم از کم 1 بڑے حرف پر مشتمل ہونا چاہیئے</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="other">کم از کم <xliff:g id="COUNT">%d</xliff:g> عددی ہندسوں پر مشتمل ہونا چاہیے</item>
+      <item quantity="one">کم از کم 1 عددی ہندسہ پر مشتمل ہونا چاہیئے</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="other">کم از کم <xliff:g id="COUNT">%d</xliff:g> خصوصی علامتوں پر مشتمل ہونا چاہیے</item>
+      <item quantity="one">کم از کم ایک خصوصی علامت پر مشتمل ہونا چاہیئے</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="other">کم از کم <xliff:g id="COUNT">%d</xliff:g> غیر حرفی علامتوں پر مشتمل ہونا چاہیے</item>
+      <item quantity="one">کم از کم ایک ایسے کریکٹر پر مشتمل ہونا چاہیئے جو حرف نہ ہو</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"آلے کا منتظم ایک حالیہ پاس ورڈ کا استعمال کرنے کی اجازت نہیں دیتا ہے۔"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ہندسوں کی صعودی، نزولی یا مکرر ترتیب منع ہے"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ٹھیک ہے"</string>
@@ -1241,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"پورٹیبل ہاٹ اسپاٹ"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ مربوط کرنا"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"مربوط کرنا"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"مربوط کرنا اور پورٹیبل ہاٹ اسپاٹ"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ڈیٹا سیور آن ہوتے ہوئے ربط نہیں بنایا جا سکتا یا پورٹیبل ہاٹ اسپاٹس استعمال نہیں ہو سکتے"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB مربوط کرنا"</string>
@@ -1581,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"اگر آپ اس سروس کو روک دیتے ہیں تو آپ کے فون کی کچھ خصوصیات ٹھیک سے کام کرنا بند کر سکتی ہیں الّا یہ کہ آپ اس کی پاور بند کر دیں اور پھر دوبارہ آن کریں۔"</string>
     <string name="language_settings" msgid="8758655933029560944">"زبانیں اور ان پٹ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"زبانیں اور ان پٹ"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"زبانیں اور علاقہ"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"ان پٹ اور اشارے"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"کی بورڈ اور اندراج کے طریقے"</string>
     <string name="phone_language" msgid="7116581601133118044">"زبانیں"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1828,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"آلہ کے سلیپ وضع میں نہ ہونے کا وقت"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏وقت پر Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏وقت پر Wi‑Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"سرگزشت کی تفصیلات"</string>
     <string name="details_title" msgid="3792801565213935385">"استعمال کی تفصیلات"</string>
     <string name="details_subtitle" msgid="32593908269911734">"استعمال کی تفصیلات"</string>
@@ -1844,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"فون معطل"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"متفرقات"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ضرورت سے زیادہ"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU کل"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU پیش منظر"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار رکھیں"</string>
@@ -1895,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"مجموعی استعمال"</string>
@@ -2399,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2680,7 +2710,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"چینلز"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"اس ایپ نے کوئی اطلاعات شائع نہیں کیا ہے"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (حذف کردہ)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
@@ -3290,7 +3323,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ایپس انسٹال نہیں ہیں"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"انسٹال کردہ ایپس"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"آپ کی اسٹوریج کا نظم اب اسٹوریج مینیجر کی جانب سے کیا جا رہا ہے"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"اکاؤنٹس"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"ترتیب دیں"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"اکاؤنٹ ڈیٹا کو خودکار مطابقت پذیر بنائیں"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ذاتی اکاؤنٹ ڈیٹا کو خودکار مطابقت پذیر بنائیں"</string>
@@ -3356,10 +3390,8 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"آف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"آن"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"گیمز"</string>
-    <!-- no translation found for audio_files_title (4777048870657911307) -->
-    <skip />
-    <!-- no translation found for audio_storage_title (5494923634269236874) -->
-    <skip />
+    <string name="audio_files_title" msgid="4777048870657911307">"آڈیو فائلز"</string>
+    <string name="audio_storage_title" msgid="5494923634269236874">"موسیقی"</string>
     <string name="webview_uninstalled_for_user" msgid="2088190546280992258">"<xliff:g id="USER">%s</xliff:g>\n صارف کے لیے ان انسٹال ہوگیا"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"<xliff:g id="USER">%s</xliff:g>\n صارف کے لیے غیر فعال ہوگیا"</string>
     <string name="autofill_app" msgid="3889348218462883960">"آٹو فل ایپ"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 50dd975..12907c4 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Xavfsizlik"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ixcham hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth modem"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Modem"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Modem rejimi"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Trafik tejash rejimida hotspotga ulanib bo‘lmaydi"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB modem"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ushbu xizmatni to‘xtatsangiz, telefoningizdagi ba\'zi imkoniyatlar ishlamay qolishi mumkin, bunday holda telefonni o‘chirib yoqishingiz kerak bo‘ladi."</string>
     <string name="language_settings" msgid="8758655933029560944">"Tillar va matn kiritish"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tillar va matn kiritish"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Til va hududlar"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Matn kiritish va imo-ishoralar"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klaviatura va matn kiritish usullari"</string>
     <string name="phone_language" msgid="7116581601133118044">"Tillar"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Qurilmaning uyg‘oqlik vaqti"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi o‘z vaqtida"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi o‘z vaqtida"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Tafsilotlar"</string>
     <string name="details_title" msgid="3792801565213935385">"Batareya sarfi"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Batareya sarfi"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Kutish rejimi"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Boshqa"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Orttirib hisoblangan"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU umumiy"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ekrandagi sarfi"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyg‘oq turish"</string>
@@ -1911,6 +1921,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ishlatildi"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Quvvat manbaidan uzilganiga <xliff:g id="UNPLUGGED">%1$s</xliff:g> bo‘ldi"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quvvat manbaidan uzilganiga <xliff:g id="UNPLUGGED">%1$s</xliff:g> bo‘ldi"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jami"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“Bezovta qilinmasin” fuksiyasi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kanallar"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Bu ilova hech qanday bildirishnoma joylamagan"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (o‘chirib tashlangan)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Barchasini bloklash"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Ilovalar o‘rnatilmagan"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"O‘rnatilgan ilovalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Xotirangiz hozirda xotira boshqaruvi tomonidan boshqarilmoqda"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Hisoblar"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Sozlash"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Avto-sinxronizatsiya (hisob)"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Avto-sinxronizatsiya (shaxsiy)"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f7cda7e..fbd6bac 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tài khoản"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Bảo mật"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Điểm phát sóng di động"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Truy cập Internet qua Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Đang dùng làm điểm truy cập Internet"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"USB Internet &amp; điểm truy cập di động"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Không thể chia sẻ kết nối hoặc sử dụng điểm phát sóng di động khi Trình tiết kiệm dữ liệu đang bật"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Truy cập Internet qua USB"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Nếu bạn dừng dịch vụ này, một số tính năng của điện thoại của bạn có thể ngừng hoạt động đúng cho tới khi bạn tắt rồi bật lại điện thoại."</string>
     <string name="language_settings" msgid="8758655933029560944">"Ngôn ngữ và nhập liệu"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Ngôn ngữ và nhập liệu"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Ngôn ngữ và khu vực"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Nhập và cử chỉ"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Bàn phím &amp; phương thức nhập"</string>
     <string name="phone_language" msgid="7116581601133118044">"Ngôn ngữ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"Thời gian thức của thiết bị"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Thời gian bật Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Thời gian bật Wi‑Fi"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Chi tiết lịch sử"</string>
     <string name="details_title" msgid="3792801565213935385">"Chi tiết sử dụng"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Chi tiết sử dụng"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Khác"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Vượt mức"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Không khóa màn hình"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> từ khi tháo đầu cắm"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Trong khi tháo đầu cắm lần cuối cho <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Tổng số sử dụng"</string>
@@ -2415,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2698,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Kênh"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Ứng dụng chưa đăng bất kỳ thông báo nào"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (đã xóa)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
@@ -3308,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Ứng dụng chưa cài đặt"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Ứng dụng đã cài đặt"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Bộ nhớ của bạn hiện đang được quản lý bởi trình quản lý bộ nhớ"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Tài khoản"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Định cấu hình"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Tự động đồng bộ hóa dữ liệu TK"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Tự động đ.bộ d.liệu TK c.nhân"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 28a9ea1..ec03d45 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帐号"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帐号"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
@@ -518,10 +519,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果您这次输入的工作密码仍然有误,您的工作资料和相关数据都将从此设备中移除。"</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"错误次数过多。您的工作资料和相关数据将会从此设备中移除。"</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"关闭"</string>
-    <!-- no translation found for lockpassword_password_too_short (2726090378672764986) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_short (3638188874397727648) -->
-    <skip />
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必须至少包含 <xliff:g id="COUNT">%d</xliff:g> 个字符"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 码必须至少为 <xliff:g id="COUNT">%d</xliff:g> 位数"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
     <string name="lockpassword_password_too_long" msgid="4520363269062591833">"必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符。"</string>
     <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数。"</string>
@@ -531,12 +530,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"必须包含至少 1 个字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"必须包含至少 1 个数字"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"必须包含至少 1 个符号"</string>
-    <!-- no translation found for lockpassword_password_requires_letters (9013132344745898400) -->
-    <!-- no translation found for lockpassword_password_requires_lowercase (2626327674921055486) -->
-    <!-- no translation found for lockpassword_password_requires_uppercase (7860796359913920356) -->
-    <!-- no translation found for lockpassword_password_requires_numeric (1967587658356336828) -->
-    <!-- no translation found for lockpassword_password_requires_symbols (6751305770863640574) -->
-    <!-- no translation found for lockpassword_password_requires_nonletter (4440596998172043055) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="other">必须包含至少 <xliff:g id="COUNT">%d</xliff:g> 个字母</item>
+      <item quantity="one">必须包含至少 1 个字母</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="other">必须包含至少 <xliff:g id="COUNT">%d</xliff:g> 个小写字母</item>
+      <item quantity="one">必须包含至少 1 个小写字母</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="other">必须包含至少 <xliff:g id="COUNT">%d</xliff:g> 个大写字母</item>
+      <item quantity="one">必须包含至少 1 个大写字母</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="other">必须包含至少 <xliff:g id="COUNT">%d</xliff:g> 个数字</item>
+      <item quantity="one">必须包含至少 1 个数字</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="other">必须包含至少 <xliff:g id="COUNT">%d</xliff:g> 个特殊符号</item>
+      <item quantity="one">必须包含至少 1 个特殊符号</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="other">必须包含至少 <xliff:g id="COUNT">%d</xliff:g> 个非字母字符</item>
+      <item quantity="one">必须包含至少 1 个非字母字符</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"设备管理器不允许使用最近用过的密码。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"禁止使用以升序、降序或重复序列进行排列的一串数字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
@@ -1241,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"便携式热点"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"蓝牙网络共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"网络共享"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"网络共享与便携式热点"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"当流量节省程序开启时,无法使用网络共享功能或便携式热点"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB网络共享"</string>
@@ -1581,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果停止此服务,您手机上的某些功能也将随之停止工作,并在您将手机关机然后再重新打开后才能使用。"</string>
     <string name="language_settings" msgid="8758655933029560944">"语言和输入法"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"语言和输入法"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"语言和区域"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"输入和手势"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"键盘和输入法"</string>
     <string name="phone_language" msgid="7116581601133118044">"语言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1828,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN开启时间"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN开启时间"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"详细电量使用记录"</string>
     <string name="details_title" msgid="3792801565213935385">"详细使用情况"</string>
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
@@ -1844,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"其他"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"多算了的"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU(前台)"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
@@ -1895,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"总使用量"</string>
@@ -2399,6 +2427,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2682,7 +2712,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“勿扰”权限"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"没有任何已安装应用申请“勿扰”权限"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"通道"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"此应用未发布任何通知"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g>(已删除)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部屏蔽"</string>
@@ -3292,7 +3325,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"未安装的应用"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安装的应用"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的存储空间目前是由存储空间管理器管理"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"帐号"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"配置"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"自动同步帐号数据"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"自动同步个人帐号数据"</string>
@@ -3358,10 +3392,8 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"关闭"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"开启"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"游戏"</string>
-    <!-- no translation found for audio_files_title (4777048870657911307) -->
-    <skip />
-    <!-- no translation found for audio_storage_title (5494923634269236874) -->
-    <skip />
+    <string name="audio_files_title" msgid="4777048870657911307">"音频文件"</string>
+    <string name="audio_storage_title" msgid="5494923634269236874">"音乐"</string>
     <string name="webview_uninstalled_for_user" msgid="2088190546280992258">"已为用户<xliff:g id="USER">%s</xliff:g>卸载\n"</string>
     <string name="webview_disabled_for_user" msgid="894201527719182879">"已为用户<xliff:g id="USER">%s</xliff:g>停用\n"</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 31a0770..d428030 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
@@ -1258,7 +1259,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式熱點"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網絡共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網絡共享"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"網絡共享和可攜式熱點"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"啟用數據節省程式時,無法使用網絡共享功能或便攜熱點。"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網絡共享"</string>
@@ -1598,8 +1600,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果您停用這項服務,您手機上的某些功能可能會停止正常運作,待您重新開機後才會恢復正常。"</string>
     <string name="language_settings" msgid="8758655933029560944">"語言及輸入"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"語言及輸入"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"語言和區域"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"輸入和手勢"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"鍵盤與輸入法"</string>
     <string name="phone_language" msgid="7116581601133118044">"語言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1845,6 +1845,8 @@
     <string name="awake" msgid="387122265874485088">"裝置啟用時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 開啟時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 開啟時間"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"詳細記錄"</string>
     <string name="details_title" msgid="3792801565213935385">"詳細使用狀況"</string>
     <string name="details_subtitle" msgid="32593908269911734">"詳細使用狀況"</string>
@@ -1861,6 +1863,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"其他"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"計算過高"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持啟用"</string>
@@ -1912,6 +1922,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"整體使用狀況"</string>
@@ -2418,6 +2430,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2689,7 +2703,7 @@
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR 助手服務"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"沒有已安裝的應用程式要求提供 VR 助手服務。"</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"允許 VR 服務存取 <xliff:g id="SERVICE">%1$s</xliff:g> 嗎?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"在虛擬現實模式下使用應用程式時,方可使用「<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>」。"</string>
+    <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"在虛擬實境模式下使用應用程式時,方可使用「<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>」。"</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"裝置在 VR 模式時"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"減少模糊 (建議)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"減少閃爍"</string>
@@ -2701,7 +2715,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"[請勿騷擾] 存取"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"沒有已安裝的應用程式要求 [請勿騷擾] 存取。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
-    <string name="notification_channels" msgid="8681423709659818791">"頻道"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"此應用程式未發佈任何通知"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (已刪除)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
@@ -3022,7 +3039,7 @@
     <string name="permit_draw_overlay" msgid="6606018549732046201">"允許覆蓋其他應用程式"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"覆蓋應用程式權限"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"此權限允許應用程式在其他使用中的應用程式上顯示內容,這可能會影響您使用其他應用程式的介面,或變更您預期在其他應用程式看到的內容。"</string>
-    <string name="keywords_vr_listener" msgid="7441221822576384680">"VR 虛擬現實 接聽器 立體聲 協助服務"</string>
+    <string name="keywords_vr_listener" msgid="7441221822576384680">"VR 虛擬實境 接聽器 立體聲 協助服務"</string>
     <string name="keywords_system_alert_window" msgid="8579673659566564926">"系統提示對話視窗覆蓋其他應用程式"</string>
     <string name="overlay_settings" msgid="222062091489691363">"覆蓋其他應用程式"</string>
     <string name="system_alert_window_summary" msgid="4268867238063922290">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個) 可以覆蓋其他應用程式"</string>
@@ -3311,7 +3328,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"尚未安裝的應用程式"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的儲存空間即將由儲存空間管理員管理"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"帳戶"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"設定"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"自動同步帳戶資料"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"自動同步個人帳戶資料"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b14ecef..7fb7455 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
@@ -1257,7 +1258,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網路共用"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網路共用"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"網路共用與可攜式無線基地台"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"在數據節省模式開啟的狀態下,無法進行數據連線或使用可攜式無線基地台"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網路共用"</string>
@@ -1597,8 +1599,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果您停用這項服務,您的手機上的某些功能可能無法正常運作,待您重新開機後才會恢復正常。"</string>
     <string name="language_settings" msgid="8758655933029560944">"語言與輸入設定"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"語言與輸入設定"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"語言與地區"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"輸入與手勢"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"鍵盤與輸入法"</string>
     <string name="phone_language" msgid="7116581601133118044">"語言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1844,6 +1844,8 @@
     <string name="awake" msgid="387122265874485088">"裝置清醒時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"開啟 Wi-Fi 的時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"開啟 Wi-Fi 的時間"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"詳細記錄"</string>
     <string name="details_title" msgid="3792801565213935385">"詳細使用狀況"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
@@ -1860,6 +1862,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"其他"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"估計過高"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前景使用時間"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
@@ -1911,6 +1921,8 @@
     <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_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <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>
     <string name="menu_stats_total" msgid="8973377864854807854">"電池整體使用狀況"</string>
@@ -2419,6 +2431,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2702,7 +2716,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"零打擾存取權"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"頻道"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"這個應用程式未發佈任何通知"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (已刪除)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
@@ -3312,7 +3329,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"未安裝的應用程式"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"你的儲存空間目前是由儲存空間管理員管理"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"帳戶"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"設定"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"自動同步處理帳戶資料"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"自動同步處理個人帳戶資料"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 253a587..84f2147 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -329,7 +329,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Ama-akhawunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"Ukuphepha"</string>
+    <!-- no translation found for security_settings_title (3149425684006628826) -->
+    <skip />
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Amaphasiwedi"</string>
@@ -1258,7 +1259,8 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"I-hotspot ephathekayo"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Imodemu nge-Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ukusebenzisa njengemodemu"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ukusebenzisa njengemodemu &amp; i-hotspot ephathekayo"</string>
+    <!-- no translation found for tether_settings_title_all (3216237959149430007) -->
+    <skip />
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Thola i-tether noma sebenzisa ama-hotspots aphathekayo ngenkathi iseva yedatha ivulekile"</string>
     <string name="usb_title" msgid="7483344855356312510">"I-USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Imodemu nge-USB"</string>
@@ -1598,8 +1600,6 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Uqinisekile ukuthi ufuna ukumisa le sevisi yesistimu? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
     <string name="language_settings" msgid="8758655933029560944">"Izilimi nokokufaka"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Izilimi nokokufaka"</string>
-    <string name="language_and_region_settings_title" msgid="117593114157670585">"Izilimi nesiyingi"</string>
-    <string name="input_gesture_settings_title" msgid="2201979773768106872">"Ukufaka nokuthinta"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ikhibhodi &amp; izindlela zokufaka"</string>
     <string name="phone_language" msgid="7116581601133118044">"Izilimi"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1845,6 +1845,8 @@
     <string name="awake" msgid="387122265874485088">"Isikhathi sokuvuka kwedivaysi"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"I-Wi-Fi isesikhathini"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"I-Wi-Fi isesikhathini"</string>
+    <!-- no translation found for advanced_battery_title (2068039111517508622) -->
+    <skip />
     <string name="history_details_title" msgid="3608240585315506067">"Imininingwane yomlando"</string>
     <string name="details_title" msgid="3792801565213935385">"Sebenzisa imininingwane"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Sebenzisa imininingwane"</string>
@@ -1861,6 +1863,14 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Okwahlukahlukene"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Okubalwe ngaphezulu"</string>
+    <!-- no translation found for power_apps (2043554781293951327) -->
+    <skip />
+    <!-- no translation found for power_service (1599661212370831780) -->
+    <skip />
+    <!-- no translation found for power_system (8290455327965307383) -->
+    <skip />
+    <!-- no translation found for power_user (1889728099253018005) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Gcina kuphapheme"</string>
@@ -1912,6 +1922,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Kusetshenziselwe okungu-%1$s"</string>
+    <!-- no translation found for battery_detail_since_full_charge (4329720759041042322) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ngenkathi igcinwe ukunqamulwa kwe <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Inani lokusetshenziswa"</string>
@@ -2416,6 +2428,8 @@
     <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 (8791523394921560711) -->
+    <skip />
     <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>
@@ -2699,7 +2713,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
-    <string name="notification_channels" msgid="8681423709659818791">"Iziteshi"</string>
+    <!-- no translation found for notification_channels (5346841743182627500) -->
+    <skip />
+    <!-- no translation found for notification_channels_other (5645317113885788226) -->
+    <skip />
     <string name="no_channels" msgid="3077375508177744586">"Lolu hlelo lokusebenza aluzange luthumele noma iziphi izaziso"</string>
     <string name="deleted_channel_name" msgid="1443368457916958928">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> (kususiwe)"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
@@ -3309,7 +3326,8 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Izinhlelo zokusebenza azifakiwe"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Izinhlelo zokusebenza ezifakiwe"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Isitoreji sakho manje siphethwe umphathi wesitoreji"</string>
-    <string name="account_for_section_header" msgid="5867553104728848377">"Ama-akhawunti"</string>
+    <!-- no translation found for account_for_section_header (5356566418548737121) -->
+    <skip />
     <string name="configure_section_header" msgid="7391183586410814450">"Misa"</string>
     <string name="auto_sync_account_title" msgid="7647106425106072285">"Idatha ye-akhawunti yokuvumelanisa ngokuzenzakalela"</string>
     <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Idatha ye-akhawunti yomuntu siqu yokuvumelanisa ngokuzenzakalela"</string>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7d9ab4a..d099cdc 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -153,4 +153,8 @@
         <attr name="aspectRatio" format="float" />
     </declare-styleable>
 
+    <declare-styleable name="TintablePreference">
+        <attr name="android:tint" format="color|reference"/>
+    </declare-styleable>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9a729da..9c3a810 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -743,7 +743,8 @@
     <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
     <string name="account_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
-    <string name="security_settings_title">Security</string>
+    <string name="security_settings_title">Security &amp; screen lock</string>
+
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
     <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
@@ -754,7 +755,8 @@
     <string name="disabled_by_administrator_summary">Disabled by administrator</string>
     <!-- In the security screen, the header title for security statuses -->
     <string name="security_status_title">Security status</string>
-
+    <!-- Summary for Security settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="security_dashboard_summary">Location, fingerprint</string>
     <!-- Fingerprint enrollment and settings --><skip />
     <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_preference_title">Fingerprint</string>
@@ -1598,11 +1600,6 @@
     <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
     <string name="wifi_avoid_poor_network_detection_summary">Only use networks that have a good Internet connection</string>
 
-    <!-- Network recommendations toggle -->
-    <!--TODO(jjoslin): Provide final strings and mark for translation. BUG: 32913919 -->
-    <string translatable="false" name="networking_allow_recommendations_title">Use network recommendations</string>
-    <string translatable="false" name="networking_allow_recommendations_summary">When enabled, use network recommendations when selecting the Wi\u2011Fi network to connect to</string>
-
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
@@ -2943,7 +2940,7 @@
     <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
     <string name="tether_settings_title_usb_bluetooth">Tethering</string>
     <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
-    <string name="tether_settings_title_all">Tethering &amp; portable hotspot</string>
+    <string name="tether_settings_title_all">Hotspot &amp; Tethering</string>
     <!-- Tethering controls, footer note displayed when tethering is disabled because Data Saver mode is on [CHAR LIMIT=none]-->
     <string name="tether_settings_disabled_on_data_saver">"Can\u2019t tether or use portable hotspots while Data Saver is on"</string>
 
@@ -3965,6 +3962,8 @@
     <string name="accessibility_settings">Accessibility</string>
     <!-- Settings title for accessibility settings screen -->
     <string name="accessibility_settings_title">Accessibility settings</string>
+    <!-- Summary for Accessibility settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="accessibility_settings_summary">Screen readers, audio, display, interaction controls</string>
     <!-- Settings title for a brief version of Vision-Related Accessibility Settings. Displayed in Setup Wizard only. [CHAR LIMIT=35] -->
     <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] -->
@@ -4317,7 +4316,9 @@
     <!-- Bluetooth on time -->
     <string name="bluetooth_on_time">Wi\u2011Fi on time</string>
 
-    <!-- Activity title for battery usage history details -->
+    <!-- Activity title for advanced battery usage page [CHAR LIMIT=60] -->
+    <string name="advanced_battery_title">Advanced battery usage</string>
+    <!-- Activity title for battery usage history details [CHAR LIMIT=60] -->
     <string name="history_details_title">History details</string>
 
     <!-- Activity title for battery usage details for an app. or power consumer -->
@@ -4351,6 +4352,14 @@
     <string name="power_unaccounted">Miscellaneous</string>
     <!-- Label for power that we computed too much for -->
     <string name="power_overcounted">Over-counted</string>
+    <!-- Label for power consumed by apps [CHAR LIMIT=30] -->
+    <string name="power_apps">Apps</string>
+    <!-- Label for power consumed by services [CHAR LIMIT=30] -->
+    <string name="power_service">Services</string>
+    <!-- Label for power consumed by system [CHAR LIMIT=30] -->
+    <string name="power_system">System</string>
+    <!-- Label for power consumed by user [CHAR LIMIT=30] -->
+    <string name="power_user">User</string>
 
     <!-- Label for CPU usage time -->
     <string name="usage_type_cpu">CPU total</string>
@@ -4470,6 +4479,8 @@
 
     <!-- Description for battery usage time for an app, i.e. Used for 30min. [CHAR LIMIT=60] -->
     <string name="battery_used_for">Used for %1$s</string>
+    <!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->
+    <string name="battery_detail_since_full_charge">Usage breakdown since last full charge</string>
 
     <!-- Menu label for viewing battery usage since unplugged -->
     <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> since unplugged</string>
@@ -5620,6 +5631,8 @@
     <string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string>
     <!-- Title for the emergency info preference [CHAR LIMIT=40] -->
     <string name="emergency_info_title">Emergency information</string>
+    <!-- Summary for the emergency info preference [CHAR LIMIT=40] -->
+    <string name="emergency_info_summary">Information about <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
 
     <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
     <string name="application_restrictions">Allow apps and content</string>
@@ -5689,6 +5702,9 @@
     <!-- Help menu label [CHAR LIMIT=20] -->
     <string name="help_label">Help &amp; feedback</string>
 
+    <!-- Summary text for support setting tile [CHAR LIMIT=None] -->
+    <string name="support_summary">Help articles, phone &amp; chat support</string>
+
     <!-- Help URI, Default [DO NOT TRANSLATE] -->
     <string name="help_uri_default" translatable="false"></string>
     <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
@@ -5947,17 +5963,23 @@
 
     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
     <string name="network_dashboard_title">Network &amp; internet</string>
+    <!-- Summary for Network and Internet settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="network_dashboard_summary">Wi-Fi, cellular, data usage, hotspot</string>
     <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
     <string name="connected_devices_dashboard_title">Connected devices</string>
+    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="connected_devices_dashboard_summary">Bluetooth, NFC, cast</string>
     <!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
     <string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>
+    <!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="app_and_notification_dashboard_summary">Permissions, default apps</string>
     <!-- Title for setting tile leading to User and accounts settings [CHAR LIMIT=40]-->
     <string name="account_dashboard_title">User &amp; accounts</string>
     <!-- Title for setting tile leading to setting UI which allows user set default app to
     handle actions such as open web page, making phone calls, default SMS apps [CHAR  LIMIT=40]-->
     <string name="app_default_dashboard_title">Default apps</string>
-    <!-- Summary text for system preference tile, showing current display language of device [CHAR LIMIT=NONE]-->
-    <string name="system_dashboard_summary">Language: <xliff:g id="language">%1$s</xliff:g></string>
+    <!-- Summary text for system preference tile, showing important setting items under system setting [CHAR LIMIT=NONE]-->
+    <string name="system_dashboard_summary">Languages, backup, updates, about phone</string>
 
     <!-- Search strings -->
     <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
@@ -6051,6 +6073,9 @@
     [CHAR LIMIT=100] -->
     <string name="sound_settings_summary">Ring volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>
 
+    <!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="sound_dashboard_summary">Volume, vibration, Do not disturb</string>
+
     <!-- Sound: Dashboard summary indicating the volume of ringtone when at 0% with vibrate enabled. [CHAR LIMIT=100] -->
     <string name="sound_settings_summary_vibrate">Ringer set to vibrate</string>
 
@@ -6372,7 +6397,10 @@
     <string name="loading_notification_apps">Loading apps...</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: channels title -->
-    <string name="notification_channels">Channels</string>
+    <string name="notification_channels">Categories</string>
+
+    <!-- [CHAR LIMIT=NONE] App notification settings: non-grouped-channels title -->
+    <string name="notification_channels_other">Other</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: no channels -->
     <string name="no_channels">This app has not posted any notifications</string>
@@ -7278,12 +7306,10 @@
     <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
     <string name="system_alert_window_off">No</string>
 
-    <!-- Title for settings screen for controlling apps that can install other apps on device [CHAR LIMIT=30] -->
+    <!-- Title for settings screen for controlling apps that can install other apps on device [CHAR LIMIT=50] -->
     <string name="install_other_apps">Install other apps</string>
     <!-- Keywords for setting screen for controlling apps that can install other apps on device -->
     <string name="keywords_install_other_apps">install apps external unknown sources</string>
-    <!-- Label for setting which controls whether app is trusted to install apps on the device [CHAR LIMIT=45] -->
-    <string name="permit_install_other_apps">Allows to install other apps</string>
 
     <!-- Write Settings settings -->
     <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
@@ -7315,7 +7341,7 @@
     <string name="external_source_trusted">Yes</string>
     <!-- Summary of app not trusted to install apps [CHAR LIMIT=45] -->
     <string name="external_source_untrusted">No</string>
-    <!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=100] -->
+    <!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
     <string name="external_source_switch_title">Trust apps from this source</string>
 
     <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
@@ -7387,10 +7413,12 @@
     <string name="apps_summary_example">24 apps installed</string>
 
     <!-- Summary of storage usage [CHAR LIMIT=NONE] -->
-    <string name="storage_summary"><xliff:g id="size1" example="8GB">%1$s</xliff:g> of <xliff:g id="size2" example="32GB">%2$s</xliff:g> used</string>
+    <string name="storage_summary"><xliff:g id="percentage" example="54%">%1$s</xliff:g> used - <xliff:g id="free_space" example="32GB">%2$s</xliff:g> free</string>
 
     <!-- Summary of display with screen sleep timeout [CHAR LIMIT=NONE] -->
     <string name="display_summary">Sleep after <xliff:g id="timeout_description" example="10 minutes">%1$s</xliff:g> of inactivity</string>
+    <!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="display_dashboard_summary">Wallpaper, sleep, font size</string>
     <!-- Example summary of display used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->
     <string name="display_summary_example">Sleep after 10 minutes of inactivity</string>
 
@@ -7757,12 +7785,6 @@
     <!-- Title of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
     <string name="developer_smallest_width">Smallest width</string>
 
-    <!-- Title of developer options time [CHAR LIMIT=60]-->
-    <string name="developer_tile">Development mode</string>
-
-    <!-- Message shown when there is no active state for development mode [CHAR LIMIT=NONE]-->
-    <string name="developer_tile_unavailable">No active state selected</string>
-
     <!-- Message shown when there are no premium SMS apps [CHAR LIMIT=NONE] -->
     <string name="premium_sms_none">No installed apps have requested Premium SMS access</string>
 
@@ -7778,6 +7800,9 @@
     <!-- [CHAR LIMIT=60] Name of dev option called "System UI demo mode" -->
     <string name="demo_mode">System UI demo mode</string>
 
+    <!-- [CHAR LIMIT=60] Name of dev option to enable extra quick settings tiles -->
+    <string name="quick_settings_developer_tiles">Quick settings developer tiles</string>
+
     <!-- Title text for connecting to customer support [CHAR LIMIT=80]-->
     <string name="support_escalation_title">We\'re here to help</string>
 
@@ -8006,15 +8031,6 @@
 
     <string name="automatic_storage_manager_freed_bytes"><xliff:g id="size" example="3.25MB">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
 
-    <!-- Dropdown preference title for dropdown describing how many days of downloads to retain.-->
-    <string name="automatic_storage_manager_downloads_days_title">Remove downloads</string>
-
-    <!-- Preference title for downloads backup toggle. [CHAR LIMIT=60]-->
-    <string name="downloads_backup_preference_title">Downloads backup</string>
-
-    <!-- Used as wall of text to describe the feature. [CHAR LIMIT=NONE] -->
-    <string name="downloads_backup_text"></string>
-
     <!-- Title text for enabling web actions. [CHAR_LIMIT=60] -->
     <string name="web_action_enable_title">Open links in apps</string>
 
@@ -8032,7 +8048,7 @@
     <string name="automatic_storage_manager_activation_warning">Your storage is now being managed by the storage manager</string>
 
     <!-- Accounts for section header [CHAR LIMIT=30] -->
-    <string name="account_for_section_header">Accounts</string>
+    <string name="account_for_section_header">Accounts for <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
 
     <!-- Configure section header [CHAR LIMIT=30] -->
     <string name="configure_section_header">Configure</string>
@@ -8144,7 +8160,7 @@
     <string name="storage_settings_2" >Phone Storage</string>
 
     <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
-    <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g> used</small></small></string>
+    <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string>
     <!-- Summary of a single storage volume free space. [CHAR LIMIT=48]-->
     <string name="storage_volume_free"><xliff:g id="total" example="32GB">%1$s</xliff:g> free</string>
     <!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]-->
@@ -8168,9 +8184,9 @@
     <string name="audio_storage_title">Music</string>
 
     <!-- UI webview setting: WebView uninstalled-for-user explanatory text [CHAR LIMIT=30] -->
-    <string name="webview_uninstalled_for_user">Uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>\n</string>
+    <string name="webview_uninstalled_for_user">(uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
     <!-- UI webview setting: WebView disabled-for-user explanatory text [CHAR LIMIT=30] -->
-    <string name="webview_disabled_for_user">Disabled for user <xliff:g id="user" example="John Doe">%s</xliff:g>\n</string>
+    <string name="webview_disabled_for_user">(disabled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
 
     <!-- AutoFill strings -->
     <!-- Preference label for the auto-fill app. [CHAR LIMIT=60] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 092d997..2f6f120 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -433,5 +433,4 @@
     </style>
 
     <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
-
 </resources>
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 404fb82..90621d7 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -26,19 +26,12 @@
         android:fragment="com.android.settings.applications.ManageAssist"
         android:order="-20"/>
 
-    <com.android.settings.applications.DefaultAutoFillPreference
-        android:key="default_autofill"
-        android:title="@string/autofill_app"
-        android:summary="@string/app_list_preference_none"
-        settings:keywords="@string/autofill_keywords"
-        android:order="-19"/>
-
     <Preference
         android:key="default_browser"
         android:title="@string/default_browser_title"
         android:summary="@string/default_browser_title_none"
         android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
-        android:order="-18">
+        android:order="-19">
         <extra android:name="for_work" android:value="false"/>
     </Preference>
 
@@ -48,26 +41,34 @@
         android:summary="@string/no_default_home"
         android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
         settings:keywords="@string/keywords_home"
-        android:order="-17"/>
+        android:order="-18"/>
 
     <Preference
         android:key="default_phone_app"
         android:title="@string/default_phone_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
         settings:keywords="@string/keywords_default_phone_app"
-        android:order="-16"/>
+        android:order="-17"/>
 
     <Preference
         android:key="default_sms_app"
         android:title="@string/sms_application_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
         settings:keywords="@string/keywords_more_default_sms_app"
-        android:order="-15"/>
+        android:order="-16"/>
 
     <Preference
         android:key="default_emergency_app"
         android:title="@string/default_emergency_app"
         settings:keywords="@string/keywords_emergency_app"
+        android:order="-15"/>
+
+    <com.android.settings.widget.GearPreference
+        android:key="default_autofill"
+        android:title="@string/autofill_app"
+        android:summary="@string/app_list_preference_none"
+        android:fragment="com.android.settings.applications.defaultapps.DefaultAutoFillPicker"
+        settings:keywords="@string/autofill_keywords"
         android:order="-14"/>
 
     <Preference
@@ -94,8 +95,8 @@
         </Preference>
 
         <Preference
-            android:key="work_default_phone_app_new"
-            android:title="new phone pref work"
+            android:key="work_default_phone_app"
+            android:title="@string/default_phone_title"
             android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
             settings:keywords="@string/keywords_default_phone_app">
             <extra android:name="for_work" android:value="true"/>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index c68e456..ef8a45c 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -34,8 +34,4 @@
         settings:useAdditionalSummary="true"
         settings:restrictedSwitchSummary="@string/enabled_by_admin" />
 
-    <PreferenceCategory
-            android:key="channels"
-            android:title="@string/notification_channels" />
-
 </PreferenceScreen>
diff --git a/res/xml/automatic_storage_management_settings.xml b/res/xml/automatic_storage_management_settings.xml
index af79396..73d708d 100644
--- a/res/xml/automatic_storage_management_settings.xml
+++ b/res/xml/automatic_storage_management_settings.xml
@@ -27,11 +27,6 @@
             android:title="@string/automatic_storage_manager_preference_title"
             android:summary="@string/automatic_storage_manager_text"/>
 
-        <SwitchPreference
-            android:key="downloads_backup_active"
-            android:title="@string/downloads_backup_preference_title"
-            android:summary="@string/downloads_backup_text"/>
-
         <Preference
             android:key="freed_bytes"
             android:persistent="false"
@@ -45,14 +40,6 @@
             android:entryValues="@array/automatic_storage_management_days_values"
             settings:allowDividerAbove="true" />
 
-        <DropDownPreference
-            android:key="downloads_days"
-            android:summary="%s"
-            android:title="@string/automatic_storage_manager_downloads_days_title"
-            android:entries="@array/automatic_storage_management_days"
-            android:entryValues="@array/automatic_storage_management_days_values"
-            settings:allowDividerAbove="true" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index b8043c9..41ec0fa 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -76,7 +76,8 @@
 
     <Preference android:key="select_webview_provider"
         android:title="@string/select_webview_provider_title"
-        android:dialogTitle="@string/select_webview_provider_dialog_title" />
+        android:dialogTitle="@string/select_webview_provider_dialog_title"
+        android:fragment="com.android.settings.webview.WebViewAppPicker" />
 
     <SwitchPreference
         android:key="enable_webview_multiprocess"
@@ -102,6 +103,14 @@
         <intent android:action="com.android.settings.action.DEMO_MODE" />
     </Preference>
 
+    <Preference
+        android:key="quick_settings_tiles"
+        android:title="@string/quick_settings_developer_tiles">
+        <intent
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.qstile.DevelopmentTileConfigActivity" />
+    </Preference>
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
diff --git a/res/xml/development_tile_prefs.xml b/res/xml/development_tile_prefs.xml
deleted file mode 100644
index 26f1c24..0000000
--- a/res/xml/development_tile_prefs.xml
+++ /dev/null
@@ -1,114 +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
-  -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <PreferenceCategory
-        android:key="debug_input_category"
-        android:title="@string/debug_input_category">
-
-        <SwitchPreference
-            android:key="show_touches"
-            android:title="@string/show_touches"
-            android:summary="@string/show_touches_summary"/>
-
-        <SwitchPreference
-            android:key="pointer_location"
-            android:title="@string/pointer_location"
-            android:summary="@string/pointer_location_summary"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="debug_drawing_category"
-        android:title="@string/debug_drawing_category">
-
-        <SwitchPreference
-            android:key="debug_layout"
-            android:title="@string/debug_layout"
-            android:summary="@string/debug_layout_summary"/>
-
-        <SwitchPreference
-            android:key="force_rtl_layout_all_locales"
-            android:title="@string/force_rtl_layout_all_locales"
-            android:summary="@string/force_rtl_layout_all_locales_summary"/>
-
-        <ListPreference
-            android:key="window_animation_scale"
-            android:defaultValue="1"
-            android:summary="%s"
-            android:title="@string/window_animation_scale_title"
-            android:entries="@array/window_animation_scale_entries"
-            android:entryValues="@array/window_animation_scale_values" />
-
-        <ListPreference
-            android:key="transition_animation_scale"
-            android:defaultValue="1"
-            android:summary="%s"
-            android:title="@string/transition_animation_scale_title"
-            android:entries="@array/transition_animation_scale_entries"
-            android:entryValues="@array/transition_animation_scale_values" />
-
-        <ListPreference
-            android:key="animator_duration_scale"
-            android:defaultValue="1"
-            android:summary="%s"
-            android:title="@string/animator_duration_scale_title"
-            android:entries="@array/animator_duration_scale_entries"
-            android:entryValues="@array/animator_duration_scale_values" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="debug_hw_drawing_category"
-        android:title="@string/debug_hw_drawing_category">
-
-        <SwitchPreference
-            android:key="show_hw_screen_udpates"
-            android:title="@string/show_hw_screen_updates"
-            android:summary="@string/show_hw_screen_updates_summary"/>
-
-        <SwitchPreference
-            android:key="show_hw_layers_udpates"
-            android:title="@string/show_hw_layers_updates"
-            android:summary="@string/show_hw_layers_updates_summary"/>
-
-        <ListPreference
-            android:key="debug_hw_overdraw"
-            android:defaultValue="false"
-            android:summary="%s"
-            android:title="@string/debug_hw_overdraw"
-            android:entries="@array/debug_hw_overdraw_entries"
-            android:entryValues="@array/debug_hw_overdraw_values" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="debug_monitoring_category"
-        android:title="@string/debug_monitoring_category">
-
-        <ListPreference
-            android:key="track_frame_time"
-            android:defaultValue="false"
-            android:summary="%s"
-            android:title="@string/track_frame_time"
-            android:entries="@array/track_frame_time_entries"
-            android:entryValues="@array/track_frame_time_values" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/installed_app_details_ia.xml b/res/xml/installed_app_details_ia.xml
index f4603ed..e72384a 100644
--- a/res/xml/installed_app_details_ia.xml
+++ b/res/xml/installed_app_details_ia.xml
@@ -23,6 +23,16 @@
         android:selectable="false"/>
 
     <Preference
+        android:key="notification_settings"
+        android:title="@string/notifications_label"
+        android:selectable="true"/>
+
+    <Preference
+        android:key="permission_settings"
+        android:title="@string/permissions_label"
+        android:selectable="true"/>
+
+    <Preference
         android:key="storage_settings"
         android:title="@string/storage_settings"
         android:selectable="true"/>
@@ -33,13 +43,8 @@
         android:selectable="true"/>
 
     <Preference
-        android:key="permission_settings"
-        android:title="@string/permissions_label"
-        android:selectable="true"/>
-
-    <Preference
-        android:key="notification_settings"
-        android:title="@string/notifications_label"
+        android:key="battery"
+        android:title="@string/power_usage_summary_title"
         android:selectable="true"/>
 
     <Preference
@@ -48,11 +53,6 @@
         android:selectable="true"/>
 
     <Preference
-        android:key="battery"
-        android:title="@string/power_usage_summary_title"
-        android:selectable="true"/>
-
-    <Preference
         android:key="memory"
         android:title="@string/memory_settings_title"
         android:enabled="false"
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index 9dbcfed..993bf91 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -16,15 +16,13 @@
   -->
 
 <PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:key="manage_assist">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/assist_and_voice_input_title">
 
     <com.android.settings.applications.DefaultAssistPreference
-            android:key="default_assist"
-            android:title="@string/default_assist_title"
-            android:summary="@string/default_assist_none"
-            />
+        android:key="default_assist"
+        android:title="@string/default_assist_title"
+        android:summary="@string/default_assist_none"/>
 
     <SwitchPreference
         android:key="context"
@@ -38,19 +36,12 @@
         android:summary="@string/assist_access_screenshot_summary"/>
 
     <SwitchPreference
-            android:key="flash"
-            android:title="@string/assist_flash_title"
-            android:summary="@string/assist_flash_summary"
-    />
+        android:key="flash"
+        android:title="@string/assist_flash_title"
+        android:summary="@string/assist_flash_summary"/>
 
     <com.android.settings.voice.VoiceInputListPreference
-            android:key="voice_input_settings"
-            android:title="@string/voice_input_settings_title"
-            />
-
-    <com.android.settings.DividerPreference
-        android:summary="@string/assist_footer"
-        android:selectable="false"
-        settings:allowDividerAbove="true" />
+        android:key="voice_input_settings"
+        android:title="@string/voice_input_settings_title"/>
 
 </PreferenceScreen>
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 7c41498..d7a6355 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -26,8 +26,8 @@
         android:icon="@drawable/ic_settings_wireless"
         android:order="-30">
         <intent
-          android:action="android.settings.WIFI_SETTINGS"
-          android:targetClass="Settings$WifiSettingsActivity" />
+            android:action="android.settings.WIFI_SETTINGS"
+            android:targetClass="Settings$WifiSettingsActivity"/>
     </com.android.settings.widget.MasterSwitchPreference>
 
     <SwitchPreference
@@ -78,23 +78,8 @@
         settings:useAdminDisabledSummary="true"/>
 
     <Preference
-        android:key="wifi_calling_settings"
-        android:title="@string/wifi_calling_settings_title"
-        android:fragment="com.android.settings.WifiCallingSettings"
-        settings:keywords="@string/keywords_wifi_calling"/>
-
-    <Preference
         android:fragment="com.android.settings.ProxySelector"
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title"/>
 
-    <!-- Network reset -->
-    <com.android.settingslib.RestrictedPreference
-        android:key="network_reset"
-        android:title="@string/reset_network_title"
-        android:icon="@drawable/ic_settings_backup_restore"
-        settings:keywords="@string/keywords_network_reset"
-        android:fragment="com.android.settings.ResetNetwork"
-        settings:userRestriction="no_network_reset"
-        settings:useAdminDisabledSummary="true"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/power_usage_advanced.xml b/res/xml/power_usage_advanced.xml
new file mode 100644
index 0000000..6422a75
--- /dev/null
+++ b/res/xml/power_usage_advanced.xml
@@ -0,0 +1,64 @@
+<?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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/advanced_battery_title"
+    settings:keywords="@string/keywords_battery">
+
+    <com.android.settings.fuelgauge.BatteryHistoryPreference
+        android:key="battery_graph"/>
+
+    <PreferenceCategory
+        android:key="battery_usage_list"
+        android:title="@string/battery_detail_since_full_charge">
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_apps"
+            android:title="@string/power_apps"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_wifi"
+            android:title="@string/power_wifi"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_cell"
+            android:title="@string/power_cell"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_service"
+            android:title="@string/power_service"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_system"
+            android:title="@string/power_system"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_bluetooth"
+            android:title="@string/power_bluetooth"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_idle"
+            android:title="@string/power_idle"/>
+
+        <com.android.settings.fuelgauge.PowerGaugePreference
+            android:key="battery_user"
+            android:title="@string/power_user"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index dd8ae55..6438771 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -22,7 +22,7 @@
         android:key="security_category"
         android:title="@string/lock_settings_title">
 
-        <com.android.settings.GearPreference
+        <com.android.settings.widget.GearPreference
             android:key="unlock_set_or_change"
             android:title="@string/unlock_set_unlock_launch_picker_title"
             android:summary="@string/unlock_set_unlock_mode_none"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index d724b74..aefbbd8 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -52,12 +52,6 @@
                 android:persistent="false"
                 android:fragment="com.android.settings.DeviceAdminSettings"/>
 
-        <com.android.settingslib.RestrictedSwitchPreference android:key="toggle_install_applications"
-                android:title="@string/install_applications"
-                android:summaryOff="@string/install_unknown_applications"
-                android:summaryOn="@string/install_unknown_applications"
-                settings:useAdditionalSummary="true" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:key="credentials_management"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 6c4d4ff..57f19eb 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -22,7 +22,7 @@
         android:key="security_category"
         android:title="@string/lock_settings_title">
 
-        <com.android.settings.GearPreference
+        <com.android.settings.widget.GearPreference
             android:key="unlock_set_or_change"
             android:title="@string/unlock_set_unlock_launch_picker_title"
             android:summary="@string/unlock_set_unlock_mode_password"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 3b463d8..ad57e82 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -22,7 +22,7 @@
         android:key="security_category"
         android:title="@string/lock_settings_title">
 
-        <com.android.settings.GearPreference
+        <com.android.settings.widget.GearPreference
             android:key="unlock_set_or_change"
             android:title="@string/unlock_set_unlock_launch_picker_title"
             android:summary="@string/unlock_set_unlock_mode_pattern"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 404a2e4..31a57a2 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -22,7 +22,7 @@
         android:key="security_category"
         android:title="@string/lock_settings_title">
 
-        <com.android.settings.GearPreference
+        <com.android.settings.widget.GearPreference
             android:key="unlock_set_or_change"
             android:title="@string/unlock_set_unlock_launch_picker_title"
             android:summary="@string/unlock_set_unlock_mode_pin"
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index ad5315d..a874020 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/wifi_configure_titlebar">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/wifi_configure_titlebar">
 
     <SwitchPreference
             android:key="enable_wifi_wakeup"
@@ -23,11 +25,6 @@
             android:summary="@string/wifi_wakeup_summary" />
 
     <SwitchPreference
-      android:key="allow_recommendations"
-      android:title="@string/networking_allow_recommendations_title"
-      android:summary="@string/networking_allow_recommendations_summary"/>
-
-    <SwitchPreference
         android:key="notify_open_networks"
         android:title="@string/wifi_notify_open_networks"
         android:summary="@string/wifi_notify_open_networks_summary" />
@@ -54,6 +51,12 @@
     </Preference>
 
     <Preference
+        android:key="wifi_calling_settings"
+        android:title="@string/wifi_calling_settings_title"
+        android:fragment="com.android.settings.WifiCallingSettings"
+        settings:keywords="@string/keywords_wifi_calling"/>
+
+    <Preference
             android:key="wifi_direct"
             android:title="@string/wifi_menu_p2p">
         <intent android:targetPackage="com.android.settings"
diff --git a/src/com/android/settings/AppListPreferenceWithSettings.java b/src/com/android/settings/AppListPreferenceWithSettings.java
index f14b982..a499a7b 100644
--- a/src/com/android/settings/AppListPreferenceWithSettings.java
+++ b/src/com/android/settings/AppListPreferenceWithSettings.java
@@ -11,6 +11,7 @@
 /**
  * An AppListPreference with optional settings button.
  */
+@Deprecated
 public class AppListPreferenceWithSettings extends AppListPreference {
 
     private View mSettingsIcon;
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 845f8cb..017a348 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -675,7 +675,7 @@
 
             if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                 mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true, mUserPassword);
-                mChooseLockSettingsHelper.utils().clearLock(mUserId);
+                mChooseLockSettingsHelper.utils().clearLock(mUserPassword, mUserId);
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
                 getActivity().setResult(Activity.RESULT_OK);
                 removeAllFingerprintForUserAndFinish(mUserId);
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index cabc805..a5f9830 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -14,18 +14,21 @@
  * limitations under the License
  */
 
+// TODO (b/35202196): move this class out of the root of the package.
 package com.android.settings;
 
 import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.ActivityOptions;
 import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.app.IActivityManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.trust.TrustManager;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.graphics.Point;
@@ -289,12 +292,13 @@
                 // Last try
                 final String title = getActivity().getString(
                         R.string.lock_profile_wipe_warning_title);
-                final String message = getActivity().getString(getLastTryErrorMessage());
-                showDialog(title, message, android.R.string.ok, false /* dismiss */);
+                LastTryDialog.show(getFragmentManager(), title, getLastTryErrorMessage(),
+                        android.R.string.ok, false /* dismiss */);
             } else if (remainingAttempts <= 0) {
                 // Profile is wiped
-                final String message = getActivity().getString(R.string.lock_profile_wipe_content);
-                showDialog(null, message, R.string.lock_profile_wipe_dismiss, true /* dismiss */);
+                LastTryDialog.show(getFragmentManager(), null /* title */,
+                        R.string.lock_profile_wipe_content, R.string.lock_profile_wipe_dismiss,
+                        true /* dismiss */);
             }
             if (mErrorTextView != null) {
                 final String message = getActivity().getString(R.string.lock_profile_wipe_attempts,
@@ -328,19 +332,55 @@
         showError(getText(msg), timeout);
     }
 
-    private void showDialog(String title, String message, int buttonString, final boolean dismiss) {
-        final AlertDialog dialog = new AlertDialog.Builder(getActivity())
-            .setTitle(title)
-            .setMessage(message)
-            .setPositiveButton(buttonString, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (dismiss) {
-                        getActivity().finish();
-                    }
-                }
-            })
-            .create();
-        dialog.show();
+    public static class LastTryDialog extends DialogFragment {
+        private static final String TAG = LastTryDialog.class.getSimpleName();
+
+        private static final String ARG_TITLE = "title";
+        private static final String ARG_MESSAGE = "message";
+        private static final String ARG_BUTTON = "button";
+        private static final String ARG_DISMISS = "dismiss";
+
+        static boolean show(FragmentManager from, String title, int message, int button,
+                boolean dismiss) {
+            LastTryDialog existent = (LastTryDialog) from.findFragmentByTag(TAG);
+            if (existent != null && !existent.isRemoving()) {
+                return false;
+            }
+            Bundle args = new Bundle();
+            args.putString(ARG_TITLE, title);
+            args.putInt(ARG_MESSAGE, message);
+            args.putInt(ARG_BUTTON, button);
+            args.putBoolean(ARG_DISMISS, dismiss);
+
+            DialogFragment dialog = new LastTryDialog();
+            dialog.setArguments(args);
+            dialog.show(from, TAG);
+            return true;
+        }
+
+        static void hide(FragmentManager from) {
+            LastTryDialog dialog = (LastTryDialog) from.findFragmentByTag(TAG);
+            if (dialog != null) {
+                dialog.dismissAllowingStateLoss();
+                from.executePendingTransactions();
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(getArguments().getString(ARG_TITLE))
+                    .setMessage(getArguments().getInt(ARG_MESSAGE))
+                    .setPositiveButton(getArguments().getInt(ARG_BUTTON), null)
+                    .create();
+        }
+
+        @Override
+        public void onDismiss(final DialogInterface dialog) {
+            super.onDismiss(dialog);
+            if (getActivity() != null && getArguments().getBoolean(ARG_DISMISS)) {
+                getActivity().finish();
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 09f5af4..823c970 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -46,7 +46,7 @@
     @Override
     public void performClick() {
         if (mUserId != UserHandle.USER_CURRENT) {
-            if (Utils.unlockWorkProfileIfNecessary(getContext(), mUserId) ||
+            if (Utils.confirmWorkProfileCredentialsIfNecessary(getContext(), mUserId) ||
                     Utils.startQuietModeDialogIfNecessary(getContext(),
                             UserManager.get(getContext()), mUserId)) {
                 return;
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 71fc990..b90466e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -233,7 +233,6 @@
 
     private static final int RESULT_DEBUG_APP = 1000;
     private static final int RESULT_MOCK_LOCATION_APP = 1001;
-    private static final int RESULT_WEBVIEW_APP = 1002;
 
     private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
     private static final String FLASH_LOCKED_PROP = "ro.boot.flash.locked";
@@ -801,7 +800,8 @@
         updateSimulateColorSpace();
         updateUSBAudioOptions();
         updateForceResizableOptions();
-        mWebViewAppPrefController.updateState(null);
+        Preference webViewAppPref = findPreference(mWebViewAppPrefController.getPreferenceKey());
+        mWebViewAppPrefController.updateState(webViewAppPref);
         updateWebViewMultiprocessOptions();
         updateOemUnlockOptions();
         if (mColorTemperaturePreference != null) {
@@ -1847,7 +1847,7 @@
         default:
             break;
         }
-        if (index >= 0) {
+        if (index >= 0 && mBluetoothSelectA2dpCodec != null) {
             summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_summaries);
             streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
             mBluetoothSelectA2dpCodec.setSummary(streaming);
@@ -1874,7 +1874,7 @@
         default:
             break;
         }
-        if (index >= 0) {
+        if (index >= 0 && mBluetoothSelectA2dpSampleRate != null) {
             summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);
             streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
              mBluetoothSelectA2dpSampleRate.setSummary(streaming);
@@ -1896,7 +1896,7 @@
         default:
             break;
         }
-        if (index >= 0) {
+        if (index >= 0 && mBluetoothSelectA2dpBitsPerSample != null) {
             summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
             streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
             mBluetoothSelectA2dpBitsPerSample.setSummary(streaming);
@@ -1915,7 +1915,7 @@
         default:
             break;
         }
-        if (index >= 0) {
+        if (index >= 0 && mBluetoothSelectA2dpChannelMode != null) {
             summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);
             streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
              mBluetoothSelectA2dpChannelMode.setSummary(streaming);
@@ -1941,7 +1941,7 @@
             index = -1;
             break;
         }
-        if (index >= 0) {
+        if (index >= 0 && mBluetoothSelectA2dpLdacPlaybackQuality != null) {
             summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
             streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
             mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(streaming);
@@ -2330,8 +2330,6 @@
                 writeMockLocation();
                 updateMockLocation();
             }
-        } else if (requestCode == RESULT_WEBVIEW_APP) {
-            mWebViewAppPrefController.onActivityResult(resultCode, data);
         } else if (requestCode == REQUEST_CODE_ENABLE_OEM_UNLOCK) {
             if (resultCode == Activity.RESULT_OK) {
                 if (mEnableOemUnlock.isChecked()) {
@@ -2355,8 +2353,7 @@
             return true;
         }
         if (mWebViewAppPrefController.handlePreferenceTreeClick(preference)) {
-            startActivityForResult(
-                    mWebViewAppPrefController.getActivityIntent(), RESULT_WEBVIEW_APP);
+            return true;
         }
 
         if (preference == mEnableAdb) {
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index d9cd047..aa17499 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -16,15 +16,12 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
-import android.provider.Settings;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.AutoRotatePreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
@@ -42,13 +39,10 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settingslib.drawer.CategoryKey;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
 public class DisplaySettings extends DashboardFragment {
     private static final String TAG = "DisplaySettings";
 
@@ -102,46 +96,6 @@
         return R.string.help_uri_display;
     }
 
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-        private final Context mContext;
-        private final SummaryLoader mLoader;
-
-        private SummaryProvider(Context context, SummaryLoader loader) {
-            mContext = context;
-            mLoader = loader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                updateSummary();
-            }
-        }
-
-        private void updateSummary() {
-            final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
-                    SCREEN_OFF_TIMEOUT, TimeoutPreferenceController.FALLBACK_SCREEN_TIMEOUT_VALUE);
-            final CharSequence[] entries =
-                    mContext.getResources().getTextArray(R.array.screen_timeout_entries);
-            final CharSequence[] values =
-                    mContext.getResources().getTextArray(R.array.screen_timeout_values);
-            final CharSequence timeoutDescription = TimeoutPreferenceController
-                    .getTimeoutDescription(currentTimeout, entries, values);
-            final String summary = timeoutDescription == null ? ""
-                    : mContext.getString(R.string.display_summary, timeoutDescription);
-            mLoader.setSummary(this, summary);
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                SummaryLoader summaryLoader) {
-            return new SummaryProvider(activity, summaryLoader);
-        }
-    };
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index d643468..5fd4f46 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -20,6 +20,7 @@
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.app.Activity;
+import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -46,6 +47,7 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.widget.CarrierDemoPasswordDialogFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
@@ -62,7 +64,8 @@
  *
  * This is the initial screen.
  */
-public class MasterClear extends OptionsMenuFragment {
+public class MasterClear extends OptionsMenuFragment
+        implements CarrierDemoPasswordDialogFragment.Callback {
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
@@ -127,12 +130,23 @@
     private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
 
         public void onClick(View v) {
-            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+            if ( Utils.isCarrierDemoUser(v.getContext())) {
+                // Require the carrier password before displaying the final confirmation.
+                final FragmentManager fm = getChildFragmentManager();
+                if (fm != null && !fm.isDestroyed()) {
+                    new CarrierDemoPasswordDialogFragment().show(fm, null /* tag */);
+                }
+            } else if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 showFinalConfirmation();
             }
         }
     };
 
+    @Override
+    public void onPasswordVerified() {
+        showFinalConfirmation();
+    }
+
     /**
      * In its initial state, the activity presents a button for the user to
      * click in order to initiate a confirmation sequence.  This method is
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 436745f..f274114 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -68,9 +68,9 @@
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.trustagent.TrustAgentManager;
+import com.android.settings.widget.GearPreference;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
@@ -86,7 +86,7 @@
  * Gesture lock pattern settings.
  */
 public class SecuritySettings extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, DialogInterface.OnClickListener, Indexable,
+        implements OnPreferenceChangeListener, Indexable,
         GearPreference.OnGearClickListener {
 
     private static final String TAG = "SecuritySettings";
@@ -120,7 +120,6 @@
     private static final String KEY_USER_CREDENTIALS = "user_credentials";
     private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
     private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";
-    private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
     private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
     private static final String KEY_TRUST_AGENT = "trust_agent";
@@ -137,8 +136,7 @@
 
     // These switch preferences need special handling since they're not all stored in Settings.
     private static final String SWITCH_PREFERENCE_KEYS[] = {
-            KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS, KEY_UNIFICATION,
-            KEY_VISIBLE_PATTERN_PROFILE
+            KEY_SHOW_PASSWORD, KEY_UNIFICATION, KEY_VISIBLE_PATTERN_PROFILE
     };
 
     // Only allow one trust agent on the platform.
@@ -165,9 +163,6 @@
     private KeyStore mKeyStore;
     private RestrictedPreference mResetCredentials;
 
-    private RestrictedSwitchPreference mToggleAppInstallation;
-    private DialogInterface mWarnInstallApps;
-
     private boolean mIsAdmin;
 
     private Intent mTrustAgentClickIntent;
@@ -397,26 +392,6 @@
         // Application install
         PreferenceGroup deviceAdminCategory = (PreferenceGroup)
                 root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
-        mToggleAppInstallation = (RestrictedSwitchPreference) findPreference(
-                KEY_TOGGLE_INSTALL_APPLICATIONS);
-        mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
-        // Side loading of apps.
-        // Disable for restricted profiles. For others, check if policy disallows it.
-        mToggleAppInstallation.setEnabled(!um.getUserInfo(MY_USER_ID).isRestricted());
-        if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
-                UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, MY_USER_ID)
-                || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
-                        UserManager.DISALLOW_INSTALL_APPS, MY_USER_ID)) {
-            mToggleAppInstallation.setEnabled(false);
-        }
-        if (mToggleAppInstallation.isEnabled()) {
-            mToggleAppInstallation.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
-            if (!mToggleAppInstallation.isDisabledByAdmin()) {
-                mToggleAppInstallation.checkRestrictionAndSetDisabled(
-                        UserManager.DISALLOW_INSTALL_APPS);
-            }
-        }
 
         // Advanced Security features
         PreferenceGroup advancedCategory =
@@ -600,43 +575,6 @@
         return result;
     }
 
-    private boolean isNonMarketAppsAllowed() {
-        return Settings.Global.getInt(getContentResolver(),
-                                      Settings.Global.INSTALL_NON_MARKET_APPS, 0) > 0;
-    }
-
-    private void setNonMarketAppsAllowed(boolean enabled) {
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)) {
-            return;
-        }
-        // Change the system setting
-        Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS,
-                                enabled ? 1 : 0);
-    }
-
-    private void warnAppInstallation() {
-        // TODO: DialogFragment?
-        mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle(
-                getResources().getString(R.string.error_title))
-                .setIcon(com.android.internal.R.drawable.ic_dialog_alert)
-                .setMessage(getResources().getString(R.string.install_all_warning))
-                .setPositiveButton(android.R.string.yes, this)
-                .setNegativeButton(android.R.string.no, this)
-                .show();
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        if (dialog == mWarnInstallApps) {
-            boolean turnOn = which == DialogInterface.BUTTON_POSITIVE;
-            setNonMarketAppsAllowed(turnOn);
-            if (mToggleAppInstallation != null) {
-                mToggleAppInstallation.setChecked(turnOn);
-            }
-        }
-    }
-
     @Override
     public void onGearClick(GearPreference p) {
         if (KEY_UNLOCK_SET_OR_CHANGE.equals(p.getKey())) {
@@ -645,14 +583,6 @@
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mWarnInstallApps != null) {
-            mWarnInstallApps.dismiss();
-        }
-    }
-
-    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         if (mTrustAgentClickIntent != null) {
@@ -857,15 +787,6 @@
             Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
                     ((Boolean) value) ? 1 : 0);
             lockPatternUtils.setVisiblePasswordEnabled((Boolean) value, MY_USER_ID);
-        } else if (KEY_TOGGLE_INSTALL_APPLICATIONS.equals(key)) {
-            if ((Boolean) value) {
-                mToggleAppInstallation.setChecked(false);
-                warnAppInstallation();
-                // Don't change Switch status until user makes choice in dialog, so return false.
-                result = false;
-            } else {
-                setNonMarketAppsAllowed(false);
-            }
         }
         return result;
     }
@@ -1379,7 +1300,8 @@
                         dashboardFeatureProvider.getTilesForCategory(CategoryKey.CATEGORY_SECURITY);
                 mSummaryLoader.setSummary(this, getPackageVerifierSummary(dashboardCategory));
             } else {
-                mSummaryLoader.setSummary(this, null);
+                mSummaryLoader.setSummary(this,
+                        mContext.getString(R.string.security_dashboard_summary));
             }
         }
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e669454..046deb3 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -163,6 +163,7 @@
     public static class WifiAPITestActivity extends SettingsActivity { /* empty */ }
     public static class WifiInfoActivity extends SettingsActivity { /* empty */ }
     public static class EnterprisePrivacySettingsActivity extends SettingsActivity { /* empty */ }
+    public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }
 
     // Categories.
     public static class WirelessSettings extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8869c5d..179b31b 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -62,7 +62,6 @@
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.qstile.DevelopmentModeTile;
 import com.android.settings.search.DynamicIndexableContentMonitor;
 import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.widget.SwitchBar;
@@ -941,9 +940,6 @@
                         Settings.DevelopmentSettingsActivity.DASHBOARD_ALIAS),
                 showDev, isAdmin);
 
-        // Reveal development-only quick settings tiles
-        setTileEnabled(new ComponentName(this, DevelopmentModeTile.class), showDev);
-
         if (UserHandle.MU_ENABLED && !isAdmin) {
             // When on restricted users, disable all extra categories (but only the settings ones).
             List<DashboardCategory> categories;
diff --git a/src/com/android/settings/TintablePreference.java b/src/com/android/settings/TintablePreference.java
index 45f43fb..2e1fd3d 100644
--- a/src/com/android/settings/TintablePreference.java
+++ b/src/com/android/settings/TintablePreference.java
@@ -17,17 +17,23 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
+import android.support.annotation.ColorInt;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
 public class TintablePreference extends Preference {
-
+    @ColorInt
     private int mTintColor;
 
     public TintablePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TintablePreference);
+        mTintColor = a.getColor(R.styleable.TintablePreference_android_tint, 0);
+        a.recycle();
     }
 
     public void setTint(int color) {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 803b8e5..b1c3ab3 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1161,6 +1161,18 @@
         if (!(new LockPatternUtils(context)).isSecure(userId)) {
             return false;
         }
+        return confirmWorkProfileCredentials(context, userId);
+    }
+
+    public static boolean confirmWorkProfileCredentialsIfNecessary(Context context, int userId) {
+        KeyguardManager km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+        if (!km.isDeviceLocked(userId)) {
+            return false;
+        }
+        return confirmWorkProfileCredentials(context, userId);
+    }
+
+    private static boolean confirmWorkProfileCredentials(Context context, int userId) {
         final KeyguardManager km = (KeyguardManager) context.getSystemService(
                 Context.KEYGUARD_SERVICE);
         final Intent unlockIntent = km.createConfirmDeviceCredentialIntent(null, null, userId);
@@ -1170,7 +1182,6 @@
         } else {
             return false;
         }
-
     }
 
     public static CharSequence getApplicationLabel(Context context, String packageName) {
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 6c613a5..910e1eb 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -31,14 +30,12 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.network.AirplaneModePreferenceController;
 import com.android.settings.network.MobileNetworkPreferenceController;
 import com.android.settings.network.MobilePlanPreferenceController;
-import com.android.settings.network.NetworkResetPreferenceController;
 import com.android.settings.network.ProxyPreferenceController;
 import com.android.settings.network.TetherPreferenceController;
 import com.android.settings.network.VpnPreferenceController;
@@ -47,7 +44,6 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedPreference;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -69,7 +65,6 @@
     private TetherPreferenceController mTetherPreferenceController;
     private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     private VpnPreferenceController mVpnPreferenceController;
-    private NetworkResetPreferenceController mNetworkResetPreferenceController;
     private WifiCallingPreferenceController mWifiCallingPreferenceController;
     private ProxyPreferenceController mProxyPreferenceController;
     private MobilePlanPreferenceController mMobilePlanPreferenceController;
@@ -150,7 +145,6 @@
         mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(activity);
         mVpnPreferenceController = new VpnPreferenceController(activity);
         mWifiCallingPreferenceController = new WifiCallingPreferenceController(activity);
-        mNetworkResetPreferenceController = new NetworkResetPreferenceController(activity);
         mProxyPreferenceController = new ProxyPreferenceController(activity);
         mMobilePlanPreferenceController = new MobilePlanPreferenceController(activity, this);
         mNfcPreferenceController = new NfcPreferenceController(activity);
@@ -162,7 +156,6 @@
         mMobileNetworkPreferenceController.displayPreference(screen);
         mVpnPreferenceController.displayPreference(screen);
         mWifiCallingPreferenceController.displayPreference(screen);
-        mNetworkResetPreferenceController.displayPreference(screen);
         mProxyPreferenceController.displayPreference(screen);
         mMobilePlanPreferenceController.displayPreference(screen);
         mNfcPreferenceController.displayPreference(screen);
@@ -270,7 +263,6 @@
 
                     new TetherPreferenceController(context).updateNonIndexableKeys(result);
                     new WifiCallingPreferenceController(context).updateNonIndexableKeys(result);
-                    new NetworkResetPreferenceController(context).updateNonIndexableKeys(result);
 
                     return result;
                 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 38f6b1a..c08c924 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -295,7 +295,8 @@
             mHelper.createAccessiblePreferenceCategory(mParent.getPreferenceManager().getContext());
         preferenceGroup.setOrder(mAccountProfileOrder++);
         if (isSingleProfile()) {
-            preferenceGroup.setTitle(R.string.account_for_section_header);
+            preferenceGroup.setTitle(context.getString(R.string.account_for_section_header,
+                userInfo.name));
             preferenceGroup.setContentDescription(
                 mContext.getString(R.string.account_settings));
         } else if (userInfo.isManagedProfile()) {
diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index 0568d83..1221947 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -18,10 +18,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.search.SearchIndexableRaw;
 
@@ -48,6 +52,12 @@
         }
     }
 
+    public void updateState(Preference preference) {
+        UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
+            UserHandle.myUserId());
+        preference.setSummary(mContext.getString(R.string.emergency_info_summary, info.name));
+    }
+
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (KEY_EMERGENCY_INFO.equals(preference.getKey())) {
diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
index dbc0292..66fd85a 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
@@ -15,14 +15,19 @@
  */
 package com.android.settings.accounts;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.UserInfo;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.drawer.Tile;
@@ -81,6 +86,36 @@
         return true;
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
+                        UserHandle.myUserId());
+                mSummaryLoader.setSummary(this, mContext.getString(R.string.user_summary,
+                        info.name));
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index e59f94b..c68e19f 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -20,6 +20,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.applications.defaultapps.DefaultAutoFillPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
@@ -60,6 +61,7 @@
         controllers.add(new DefaultSmsPreferenceController(context));
         controllers.add(new DefaultEmergencyPreferenceController(context));
         controllers.add(new DefaultHomePreferenceController(context));
+        controllers.add(new DefaultAutoFillPreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
index a6321df..5b243ff 100644
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ b/src/com/android/settings/applications/AppHeaderController.java
@@ -37,6 +37,7 @@
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.applications.instantapps.InstantAppDetails;
 import com.android.settingslib.applications.ApplicationsState;
 
 import java.lang.annotation.Retention;
@@ -78,6 +79,8 @@
     @ActionType
     private int mRightAction;
 
+    private InstantAppDetails mInstantAppDetails;
+
     public AppHeaderController(Context context, Fragment fragment, View appHeader) {
         mContext = context;
         mFragment = fragment;
@@ -147,6 +150,11 @@
         return this;
     }
 
+    public AppHeaderController setInstantAppDetails(InstantAppDetails instantAppDetails) {
+        mInstantAppDetails = instantAppDetails;
+        return this;
+    }
+
     /**
      * Binds app header view and data from {@code PackageInfo} and {@code AppEntry}.
      */
@@ -207,6 +215,29 @@
         if (rebindActions) {
             bindAppHeaderButtons();
         }
+
+        if (mInstantAppDetails != null) {
+            setText(R.id.instant_app_developer_title, mInstantAppDetails.developerTitle);
+            View maturity = mAppHeader.findViewById(R.id.instant_app_maturity);
+
+            if (maturity != null) {
+                String maturityText = mInstantAppDetails.maturityRatingString;
+                Drawable maturityIcon = mInstantAppDetails.maturityRatingIcon;
+                if (!TextUtils.isEmpty(maturityText) || maturityIcon != null) {
+                    maturity.setVisibility(View.VISIBLE);
+                }
+                setText(R.id.instant_app_maturity_text, maturityText);
+                if (maturityIcon != null) {
+                    ImageView maturityIconView = (ImageView) mAppHeader.findViewById(
+                            R.id.instant_app_maturity_icon);
+                    if (maturityIconView != null) {
+                        maturityIconView.setImageDrawable(maturityIcon);
+                    }
+                }
+            }
+            setText(R.id.instant_app_monetization, mInstantAppDetails.monetizationNotice);
+        }
+
         return mAppHeader;
     }
 
diff --git a/src/com/android/settings/applications/DefaultAutoFillPreference.java b/src/com/android/settings/applications/DefaultAutoFillPreference.java
deleted file mode 100644
index d3b1b12..0000000
--- a/src/com/android/settings/applications/DefaultAutoFillPreference.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.annotation.Nullable;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.provider.Settings;
-import android.service.autofill.AutoFillService;
-import android.service.autofill.AutoFillServiceInfo;
-import android.util.AttributeSet;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.AppListPreferenceWithSettings;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DefaultAutoFillPreference extends AppListPreferenceWithSettings {
-    private static final String TAG = "DefaultAutoFill";
-
-    private static final String SETTING = Settings.Secure.AUTO_FILL_SERVICE;
-
-    public DefaultAutoFillPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        setSavesState(false);
-        setShowItemNone(true);
-
-        refreshData();
-    }
-
-    @Override
-    protected CharSequence getConfirmationMessage(String value) {
-        if (value == null || value.isEmpty()) {
-            return null;
-        }
-
-        int index = findIndexOfValue(value);
-        CharSequence[] entries = getEntries();
-        if (index < 0 || index >= entries.length) {
-            return null;
-        }
-
-        CharSequence entry = entries[index];
-        return getContext().getString(R.string.autofill_confirmation_message, entry);
-    }
-
-    @Override
-    protected boolean persistString(String value) {
-        Settings.Secure.putString(getContext().getContentResolver(), SETTING, value);
-        refreshData();
-        return true;
-    }
-
-    private void refreshData() {
-        ComponentName selectedComponent = getSelectedComponentName();
-        List<AutoFillServiceInfo> infos = getInfos();
-
-        AutoFillServiceInfo selectedInfo = null;
-        int numberOfComponents = infos.size();
-        ComponentName[] components = new ComponentName[numberOfComponents];
-        for (int i = 0; i < numberOfComponents; ++i) {
-            AutoFillServiceInfo info = infos.get(i);
-            ServiceInfo serviceInfo = info.getServiceInfo();
-            ComponentName component =
-                    new ComponentName(serviceInfo.packageName, serviceInfo.name);
-            components[i] = component;
-
-            if (component.equals(selectedComponent)) {
-                selectedInfo = info;
-            }
-        }
-
-        ComponentName selectedComponentSettings = null;
-        if (selectedInfo != null) {
-            String settingsActivity = selectedInfo.getSettingsActivity();
-            selectedComponentSettings = settingsActivity != null
-                    ? new ComponentName(selectedComponent.getPackageName(), settingsActivity)
-                    : null;
-        } else { // selected component not found
-            Log.w(TAG, "Selected AutoFillService not found " + selectedComponent);
-            selectedComponent = null;
-            selectedComponentSettings = null;
-        }
-
-        setComponentNames(components, selectedComponent);
-        setSettingsComponent(selectedComponentSettings);
-        setSummary(getEntry());
-    }
-
-    @Nullable
-    private ComponentName getSelectedComponentName() {
-        String componentString =
-                Settings.Secure.getString(getContext().getContentResolver(), SETTING);
-        if (componentString == null) {
-            return null;
-        }
-
-        return ComponentName.unflattenFromString(componentString);
-    }
-
-    private List<AutoFillServiceInfo> getInfos() {
-        PackageManager pm = getContext().getPackageManager();
-        List<ResolveInfo> resolveInfos = pm.queryIntentServices(
-                new Intent(AutoFillService.SERVICE_INTERFACE),
-                PackageManager.GET_META_DATA);
-        List<AutoFillServiceInfo> infos = new ArrayList<>(resolveInfos.size());
-        for (ResolveInfo resolveInfo : resolveInfos) {
-            ServiceInfo serviceInfo = resolveInfo.serviceInfo;
-            AutoFillServiceInfo info = new AutoFillServiceInfo(pm, serviceInfo);
-            infos.add(info);
-        }
-        return infos;
-    }
-}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 7c187a7..146e1ff 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1140,7 +1140,7 @@
         public void onPackageSizeChanged(String packageName) {
             for (int i = 0; i < mActive.size(); i++) {
                 AppViewHolder holder = (AppViewHolder) mActive.get(i).getTag();
-                if (holder == null) {
+                if (holder == null || holder.entry == null) {
                     continue;
                 }
                 ApplicationInfo info = holder.entry.info;
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
index 37ae56f..7fe5637 100644
--- a/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@ -68,7 +68,8 @@
 
         mFlashPref = (SwitchPreference) findPreference(KEY_FLASH);
         mFlashPref.setOnPreferenceChangeListener(this);
-
+        mFooterPreferenceMixin.createFooterPreference()
+                .setTitle(R.string.assist_footer);
         mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
         updateUi();
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
index 7801591..ea3a27a 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
@@ -29,25 +29,33 @@
 /**
  * Data model representing an app in DefaultAppPicker UI.
  */
-class DefaultAppInfo {
+public class DefaultAppInfo {
 
     public final int userId;
     public final ComponentName componentName;
     public final PackageItemInfo packageItemInfo;
     public final String summary;
+    // Description for why this item is disabled, if null, the item is enabled.
+    public final String disabledDescription;
 
     public DefaultAppInfo(int uid, ComponentName cn, String summary) {
         packageItemInfo = null;
         userId = uid;
         componentName = cn;
         this.summary = summary;
+        this.disabledDescription = null;
     }
 
-    public DefaultAppInfo(PackageItemInfo info) {
+    public DefaultAppInfo(PackageItemInfo info, String description) {
         userId = UserHandle.myUserId();
         packageItemInfo = info;
         componentName = null;
         summary = null;
+        this.disabledDescription = description;
+    }
+
+    public DefaultAppInfo(PackageItemInfo info) {
+        this(info, null);
     }
 
     public CharSequence loadLabel(PackageManager pm) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index b322dab..358b5f4 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -91,6 +91,11 @@
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.app_picker_prefs);
+        updateCandidates();
+    }
+
+    @VisibleForTesting
+    public void updateCandidates() {
         mCandidates.clear();
         final List<DefaultAppInfo> candidateList = getCandidates();
         if (candidateList != null) {
@@ -113,19 +118,26 @@
         for (Map.Entry<String, DefaultAppInfo> app : mCandidates.entrySet()) {
             final RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
             final String appKey = app.getKey();
-
-            pref.setTitle(app.getValue().loadLabel(mPm.getPackageManager()));
-            pref.setIcon(app.getValue().loadIcon(mPm.getPackageManager()));
+            final DefaultAppInfo info = app.getValue();
+            pref.setTitle(info.loadLabel(mPm.getPackageManager()));
+            pref.setIcon(info.loadIcon(mPm.getPackageManager()));
             pref.setKey(appKey);
             if (TextUtils.equals(defaultAppKey, appKey)) {
                 pref.setChecked(true);
             }
             if (TextUtils.equals(systemDefaultAppKey, appKey)) {
                 pref.setSummary(R.string.system_app);
+            } else if (!TextUtils.isEmpty(info.summary)) {
+                pref.setSummary(info.summary);
+            }
+            if (!TextUtils.isEmpty(app.getValue().disabledDescription)) {
+                pref.setEnabled(false);
+                pref.setSummary(app.getValue().disabledDescription);
             }
             pref.setOnClickListener(this);
             screen.addPreference(pref);
         }
+        mayCheckOnlyRadioButton();
     }
 
     @Override
@@ -145,24 +157,41 @@
     private void onRadioButtonConfirmed(String selectedKey) {
         final boolean success = setDefaultAppKey(selectedKey);
         if (success) {
-            final PreferenceScreen screen = getPreferenceScreen();
-            if (screen != null) {
-                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;
-                        final boolean newCheckedState =
-                                TextUtils.equals(pref.getKey(), selectedKey);
-                        if (radioPref.isChecked() != newCheckedState) {
-                            radioPref.setChecked(TextUtils.equals(pref.getKey(), selectedKey));
-                        }
+            updateCheckedState(selectedKey);
+        }
+        onSelectionPerformed(success);
+    }
+
+    @VisibleForTesting
+    public void updateCheckedState(String selectedKey) {
+        final PreferenceScreen screen = getPreferenceScreen();
+        if (screen != null) {
+            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;
+                    final boolean newCheckedState = TextUtils.equals(pref.getKey(), selectedKey);
+                    if (radioPref.isChecked() != newCheckedState) {
+                        radioPref.setChecked(TextUtils.equals(pref.getKey(), selectedKey));
                     }
                 }
             }
         }
     }
 
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    void mayCheckOnlyRadioButton() {
+        final PreferenceScreen screen = getPreferenceScreen();
+        // If there is only 1 thing on screen, select it.
+        if (screen != null && screen.getPreferenceCount() == 1) {
+            final Preference onlyPref = screen.getPreference(0);
+            if (onlyPref instanceof RadioButtonPreference) {
+                ((RadioButtonPreference) onlyPref).setChecked(true);
+            }
+        }
+    }
+
     protected boolean shouldShowItemNone() {
         return false;
     }
@@ -177,6 +206,9 @@
 
     protected abstract boolean setDefaultAppKey(String key);
 
+    // Called after the user tries to select an item.
+    protected void onSelectionPerformed(boolean success) {}
+
     protected String getConfirmationMessage(DefaultAppInfo appInfo) {
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index a9433ac..d8fb225 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.defaultapps;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -26,6 +27,7 @@
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.widget.GearPreference;
 
 public abstract class DefaultAppPreferenceController extends PreferenceController {
 
@@ -54,8 +56,31 @@
             preference.setSummary(defaultAppLabel);
         } else {
             Log.d(TAG, "No default app");
+            preference.setSummary(null);
+        }
+        mayUpdateGearIcon(app, preference);
+    }
+
+    private void mayUpdateGearIcon(DefaultAppInfo app, Preference preference) {
+        if (!(preference instanceof GearPreference)) {
+            return;
+        }
+        final Intent settingIntent = getSettingIntent(app);
+        if (settingIntent != null) {
+            ((GearPreference) preference).setOnGearClickListener(
+                    p -> mContext.startActivity(settingIntent));
+        } else {
+            ((GearPreference) preference).setOnGearClickListener(null);
         }
     }
 
     protected abstract DefaultAppInfo getDefaultAppInfo();
+
+    /**
+     * Returns an optional intent that will be launched when clicking "gear" icon.
+     */
+    protected Intent getSettingIntent(DefaultAppInfo info) {
+        //By default return null. It's up to subclasses to provide logic.
+        return null;
+    }
 }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java
new file mode 100644
index 0000000..5b9fed4
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java
@@ -0,0 +1,119 @@
+/*
+ * 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.defaultapps;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.provider.Settings;
+import android.service.autofill.AutoFillService;
+import android.service.autofill.AutoFillServiceInfo;
+import android.text.TextUtils;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultAutoFillPicker extends DefaultAppPickerFragment {
+
+    static final String SETTING = Settings.Secure.AUTO_FILL_SERVICE;
+    static final Intent AUTO_FILL_PROBE = new Intent(AutoFillService.SERVICE_INTERFACE);
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER;
+    }
+
+    @Override
+    protected boolean shouldShowItemNone() {
+        return true;
+    }
+
+    @Override
+    protected List<DefaultAppInfo> getCandidates() {
+        final List<DefaultAppInfo> candidates = new ArrayList<>();
+        final List<ResolveInfo> resolveInfos = mPm.getPackageManager()
+                .queryIntentServices(AUTO_FILL_PROBE, PackageManager.GET_META_DATA);
+        for (ResolveInfo info : resolveInfos) {
+            candidates.add(new DefaultAppInfo(mUserId, new ComponentName(
+                    info.serviceInfo.packageName, info.serviceInfo.name), null /* summary */));
+        }
+        return candidates;
+    }
+
+    @Override
+    protected String getDefaultAppKey() {
+        return Settings.Secure.getString(getContext().getContentResolver(), SETTING);
+    }
+
+    @Override
+    protected String getConfirmationMessage(DefaultAppInfo appInfo) {
+        if (appInfo == null) {
+            return null;
+        }
+        final CharSequence appName = appInfo.loadLabel(mPm.getPackageManager());
+        return getContext().getString(R.string.autofill_confirmation_message, appName);
+    }
+
+    @Override
+    protected boolean setDefaultAppKey(String key) {
+        Settings.Secure.putString(getContext().getContentResolver(), SETTING, key);
+        return true;
+    }
+
+    /**
+     * Provides Intent to setting activity for the specified auto-fill service.
+     */
+    static final class AutoFillSettingIntentProvider
+            implements SettingIntentProvider {
+
+        private final String mSelectedKey;
+        private final PackageManager mPackageManager;
+
+        public AutoFillSettingIntentProvider(PackageManager packageManager, String key) {
+            mSelectedKey = key;
+            mPackageManager = packageManager;
+        }
+
+        @Override
+        public Intent getIntent() {
+            final List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(
+                    AUTO_FILL_PROBE, PackageManager.GET_META_DATA);
+
+            for (ResolveInfo resolveInfo : resolveInfos) {
+                final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
+                final String flattenKey = new ComponentName(
+                        serviceInfo.packageName, serviceInfo.name).flattenToString();
+                if (TextUtils.equals(mSelectedKey, flattenKey)) {
+                    final String settingsActivity = new AutoFillServiceInfo(
+                            mPackageManager, serviceInfo)
+                            .getSettingsActivity();
+                    if (TextUtils.isEmpty(settingsActivity)) {
+                        return null;
+                    }
+                    return new Intent(Intent.ACTION_MAIN).setComponent(
+                            new ComponentName(serviceInfo.packageName, settingsActivity));
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java
new file mode 100644
index 0000000..35e4ade
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java
@@ -0,0 +1,63 @@
+/*
+ * 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.defaultapps;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+public class DefaultAutoFillPreferenceController extends DefaultAppPreferenceController {
+
+    public DefaultAutoFillPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "default_autofill";
+    }
+
+    @Override
+    protected Intent getSettingIntent(DefaultAppInfo info) {
+        if (info == null) {
+            return null;
+        }
+        final DefaultAutoFillPicker.AutoFillSettingIntentProvider intentProvider =
+                new DefaultAutoFillPicker.AutoFillSettingIntentProvider(
+                        mPackageManager.getPackageManager(), info.getKey());
+        return intentProvider.getIntent();
+    }
+
+    @Override
+    protected DefaultAppInfo getDefaultAppInfo() {
+        final String flattenComponent = Settings.Secure.getString(mContext.getContentResolver(),
+                DefaultAutoFillPicker.SETTING);
+        if (!TextUtils.isEmpty(flattenComponent)) {
+            DefaultAppInfo appInfo = new DefaultAppInfo(
+                    mUserId, ComponentName.unflattenFromString(flattenComponent), null /*summary*/);
+            return appInfo;
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java b/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java
new file mode 100644
index 0000000..a6e3edf
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java
@@ -0,0 +1,28 @@
+/*
+ * 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.defaultapps;
+
+import android.annotation.Nullable;
+import android.content.Intent;
+
+/**
+ * Provides an "advanced setting" intent for this app info.
+ */
+interface SettingIntentProvider {
+    @Nullable
+    Intent getIntent();
+}
diff --git a/src/com/android/settings/applications/instantapps/InstantAppDetails.java b/src/com/android/settings/applications/instantapps/InstantAppDetails.java
new file mode 100644
index 0000000..8b54c20
--- /dev/null
+++ b/src/com/android/settings/applications/instantapps/InstantAppDetails.java
@@ -0,0 +1,110 @@
+/*
+ * 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.instantapps;
+
+import android.graphics.drawable.Drawable;
+import java.net.URL;
+
+/**
+ * Encapsulates state about instant apps that is provided by an app store implementation.
+ */
+public class InstantAppDetails {
+
+    // Most of these members are self-explanatory; the one that may not be is
+    // monetizationNotice, which is a string alerting users that the app contains ads and/or uses
+    // in-app purchases (this may eventually become two separate members).
+    public final Drawable maturityRatingIcon;
+    public final String maturityRatingString;
+    public final String monetizationNotice;
+    public final String developerTitle;
+    public final URL privacyPolicy;
+    public final URL developerWebsite;
+    public final String developerEmail;
+    public final String developerMailingAddress;
+
+    public static class Builder {
+        private Drawable mMaturityRatingIcon;
+        private String mMaturityRatingString;
+        private String mMonetizationNotice;
+        private String mDeveloperTitle;
+        private URL mPrivacyPolicy;
+        private URL mDeveloperWebsite;
+        private String mDeveloperEmail;
+        private String mDeveloperMailingAddress;
+
+        public Builder maturityRatingIcon(Drawable maturityRatingIcon) {
+            this.mMaturityRatingIcon = maturityRatingIcon;
+            return this;
+        }
+
+        public Builder maturityRatingString(String maturityRatingString) {
+            mMaturityRatingString = maturityRatingString;
+            return this;
+        }
+
+        public Builder monetizationNotice(String monetizationNotice) {
+            mMonetizationNotice = monetizationNotice;
+            return this;
+        }
+
+        public Builder developerTitle(String developerTitle) {
+            mDeveloperTitle = developerTitle;
+            return this;
+        }
+
+        public Builder privacyPolicy(URL privacyPolicy) {
+            mPrivacyPolicy = privacyPolicy;
+            return this;
+        }
+
+        public Builder developerWebsite(URL developerWebsite) {
+            mDeveloperWebsite = developerWebsite;
+            return this;
+        }
+
+        public Builder developerEmail(String developerEmail) {
+            mDeveloperEmail = developerEmail;
+            return this;
+        }
+
+        public Builder developerMailingAddress(String developerMailingAddress) {
+            mDeveloperMailingAddress = developerMailingAddress;
+            return this;
+        }
+
+        public InstantAppDetails build() {
+            return new InstantAppDetails(mMaturityRatingIcon, mMaturityRatingString,
+                    mMonetizationNotice, mDeveloperTitle, mPrivacyPolicy, mDeveloperWebsite,
+                    mDeveloperEmail, mDeveloperMailingAddress);
+        }
+    }
+
+    public static Builder builder() { return new Builder(); }
+
+    private InstantAppDetails(Drawable maturityRatingIcon, String maturityRatingString,
+            String monetizationNotice, String developerTitle, URL privacyPolicy,
+            URL developerWebsite, String developerEmail, String developerMailingAddress) {
+        this.maturityRatingIcon = maturityRatingIcon;
+        this.maturityRatingString = maturityRatingString;
+        this.monetizationNotice = monetizationNotice;
+        this.developerTitle = developerTitle;
+        this.privacyPolicy = privacyPolicy;
+        this.developerWebsite = developerWebsite;
+        this.developerEmail = developerEmail;
+        this.developerMailingAddress = developerMailingAddress;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/DockEventReceiver.java b/src/com/android/settings/bluetooth/DockEventReceiver.java
deleted file mode 100644
index 048b098..0000000
--- a/src/com/android/settings/bluetooth/DockEventReceiver.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.app.Service;
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.PowerManager;
-import android.util.Log;
-
-public final class DockEventReceiver extends BroadcastReceiver {
-
-    private static final boolean DEBUG = DockService.DEBUG;
-
-    private static final String TAG = "DockEventReceiver";
-
-    public static final String ACTION_DOCK_SHOW_UI =
-        "com.android.settings.bluetooth.action.DOCK_SHOW_UI";
-
-    private static final int EXTRA_INVALID = -1234;
-
-    private static final Object sStartingServiceSync = new Object();
-
-    private static PowerManager.WakeLock sStartingService;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent == null)
-            return;
-
-        int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, intent.getIntExtra(
-                BluetoothAdapter.EXTRA_STATE, EXTRA_INVALID));
-        BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-
-        if (DEBUG) {
-            Log.d(TAG, "Action: " + intent.getAction() + " State:" + state + " Device: "
-                    + (device == null ? "null" : device.getAliasName()));
-        }
-
-        if (Intent.ACTION_DOCK_EVENT.equals(intent.getAction())
-                || ACTION_DOCK_SHOW_UI.endsWith(intent.getAction())) {
-            if ((device == null) && (ACTION_DOCK_SHOW_UI.endsWith(intent.getAction()) ||
-                    ((state != Intent.EXTRA_DOCK_STATE_UNDOCKED) &&
-                     (state != Intent.EXTRA_DOCK_STATE_LE_DESK)))) {
-                if (DEBUG) Log.d(TAG,
-                        "Wrong state: "+state+" or intent: "+intent.toString()+" with null device");
-                return;
-            }
-
-            switch (state) {
-                case Intent.EXTRA_DOCK_STATE_UNDOCKED:
-                case Intent.EXTRA_DOCK_STATE_CAR:
-                case Intent.EXTRA_DOCK_STATE_DESK:
-                case Intent.EXTRA_DOCK_STATE_LE_DESK:
-                case Intent.EXTRA_DOCK_STATE_HE_DESK:
-                    Intent i = new Intent(intent);
-                    i.setClass(context, DockService.class);
-                    beginStartingService(context, i);
-                    break;
-                default:
-                    Log.e(TAG, "Unknown state: " + state);
-                    break;
-            }
-        } else if (BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction()) ||
-                   BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
-            int newState = intent.getIntExtra(BluetoothProfile.EXTRA_STATE,
-                    BluetoothProfile.STATE_CONNECTED);
-            int oldState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, 0);
-
-            /*
-             *  Reconnect to the dock if:
-             *  1) it is a dock
-             *  2) it is disconnected
-             *  3) the disconnect is initiated remotely
-             *  4) the dock is still docked (check can only be done in the Service)
-             */
-            if (device == null) {
-                if (DEBUG) Log.d(TAG, "Device is missing");
-                return;
-            }
-
-            if (newState == BluetoothProfile.STATE_DISCONNECTED &&
-                    oldState != BluetoothProfile.STATE_DISCONNECTING) {
-                // Too bad, the dock state can't be checked from a BroadcastReceiver.
-                Intent i = new Intent(intent);
-                i.setClass(context, DockService.class);
-                beginStartingService(context, i);
-            }
-
-        } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {
-            int btState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
-            if (btState != BluetoothAdapter.STATE_TURNING_ON) {
-                Intent i = new Intent(intent);
-                i.setClass(context, DockService.class);
-                beginStartingService(context, i);
-            }
-        }
-    }
-
-    /**
-     * Start the service to process the current event notifications, acquiring
-     * the wake lock before returning to ensure that the service will run.
-     */
-    private static void beginStartingService(Context context, Intent intent) {
-        synchronized (sStartingServiceSync) {
-            if (sStartingService == null) {
-                PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                sStartingService = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                        "StartingDockService");
-            }
-
-            sStartingService.acquire();
-
-            if (context.startService(intent) == null) {
-                Log.e(TAG, "Can't start DockService");
-            }
-        }
-    }
-
-    /**
-     * Called back by the service when it has finished processing notifications,
-     * releasing the wake lock if the service is now stopping.
-     */
-    public static void finishStartingService(Service service, int startId) {
-        synchronized (sStartingServiceSync) {
-            if (sStartingService != null) {
-                if (DEBUG) Log.d(TAG, "stopSelf id = " + startId);
-                if (service.stopSelfResult(startId)) {
-                    Log.d(TAG, "finishStartingService: stopping service");
-                    sStartingService.release();
-                }
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
deleted file mode 100644
index 52a015e..0000000
--- a/src/com/android/settings/bluetooth/DockService.java
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.app.AlertDialog;
-import android.app.Notification;
-import android.app.Service;
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-
-import com.android.settings.R;
-import com.android.settingslib.bluetooth.BluetoothCallback;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.bluetooth.LocalBluetoothProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
-import com.android.settingslib.bluetooth.LocalBluetoothProfileManager.ServiceListener;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-public final class DockService extends Service implements ServiceListener {
-
-    private static final String TAG = "DockService";
-
-    static final boolean DEBUG = false;
-
-    // Time allowed for the device to be undocked and redocked without severing
-    // the bluetooth connection
-    private static final long UNDOCKED_GRACE_PERIOD = 1000;
-
-    // Time allowed for the device to be undocked and redocked without turning
-    // off Bluetooth
-    private static final long DISABLE_BT_GRACE_PERIOD = 2000;
-
-    // Msg for user wanting the UI to setup the dock
-    private static final int MSG_TYPE_SHOW_UI = 111;
-
-    // Msg for device docked event
-    private static final int MSG_TYPE_DOCKED = 222;
-
-    // Msg for device undocked event
-    private static final int MSG_TYPE_UNDOCKED_TEMPORARY = 333;
-
-    // Msg for undocked command to be process after UNDOCKED_GRACE_PERIOD millis
-    // since MSG_TYPE_UNDOCKED_TEMPORARY
-    private static final int MSG_TYPE_UNDOCKED_PERMANENT = 444;
-
-    // Msg for disabling bt after DISABLE_BT_GRACE_PERIOD millis since
-    // MSG_TYPE_UNDOCKED_PERMANENT
-    private static final int MSG_TYPE_DISABLE_BT = 555;
-
-    private static final String SHARED_PREFERENCES_NAME = "dock_settings";
-
-    private static final String KEY_DISABLE_BT_WHEN_UNDOCKED = "disable_bt_when_undock";
-
-    private static final String KEY_DISABLE_BT = "disable_bt";
-
-    private static final String KEY_CONNECT_RETRY_COUNT = "connect_retry_count";
-
-    /*
-     * If disconnected unexpectedly, reconnect up to 6 times. Each profile counts
-     * as one time so it's only 3 times for both profiles on the car dock.
-     */
-    private static final int MAX_CONNECT_RETRY = 6;
-
-    private static final int INVALID_STARTID = -100;
-
-    // Created in OnCreate()
-    private volatile Looper mServiceLooper;
-    private volatile ServiceHandler mServiceHandler;
-    private Runnable mRunnable;
-    private LocalBluetoothAdapter mLocalAdapter;
-    private CachedBluetoothDeviceManager mDeviceManager;
-    private LocalBluetoothProfileManager mProfileManager;
-
-    // Normally set after getting a docked event and unset when the connection
-    // is severed. One exception is that mDevice could be null if the service
-    // was started after the docked event.
-    private BluetoothDevice mDevice;
-
-    // Created and used for the duration of the dialog
-    private AlertDialog mDialog;
-    private LocalBluetoothProfile[] mProfiles;
-    private boolean[] mCheckedItems;
-    private int mStartIdAssociatedWithDialog;
-
-    // Set while BT is being enabled.
-    private BluetoothDevice mPendingDevice;
-    private int mPendingStartId;
-    private int mPendingTurnOnStartId = INVALID_STARTID;
-    private int mPendingTurnOffStartId = INVALID_STARTID;
-
-    private CheckBox mAudioMediaCheckbox;
-
-    @Override
-    public void onCreate() {
-        if (DEBUG) Log.d(TAG, "onCreate");
-
-        LocalBluetoothManager manager = Utils.getLocalBtManager(this);
-        if (manager == null) {
-            Log.e(TAG, "Can't get LocalBluetoothManager: exiting");
-            return;
-        }
-
-        mLocalAdapter = manager.getBluetoothAdapter();
-        mDeviceManager = manager.getCachedDeviceManager();
-        mProfileManager = manager.getProfileManager();
-        if (mProfileManager == null) {
-            Log.e(TAG, "Can't get LocalBluetoothProfileManager: exiting");
-            return;
-        }
-
-        HandlerThread thread = new HandlerThread("DockService");
-        thread.start();
-
-        mServiceLooper = thread.getLooper();
-        mServiceHandler = new ServiceHandler(mServiceLooper);
-    }
-
-    @Override
-    public void onDestroy() {
-        if (DEBUG) Log.d(TAG, "onDestroy");
-        mRunnable = null;
-        if (mDialog != null) {
-            mDialog.dismiss();
-            mDialog = null;
-        }
-        if (mProfileManager != null) {
-            mProfileManager.removeServiceListener(this);
-        }
-        if (mServiceLooper != null) {
-            mServiceLooper.quit();
-        }
-
-        mLocalAdapter = null;
-        mDeviceManager = null;
-        mProfileManager = null;
-        mServiceLooper = null;
-        mServiceHandler = null;
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        // not supported
-        return null;
-    }
-
-    private SharedPreferences getPrefs() {
-        return getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE);
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (DEBUG) Log.d(TAG, "onStartCommand startId: " + startId + " flags: " + flags);
-
-        if (intent == null) {
-            // Nothing to process, stop.
-            if (DEBUG) Log.d(TAG, "START_NOT_STICKY - intent is null.");
-
-            // NOTE: We MUST not call stopSelf() directly, since we need to
-            // make sure the wake lock acquired by the Receiver is released.
-            DockEventReceiver.finishStartingService(this, startId);
-            return START_NOT_STICKY;
-        }
-
-        if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {
-            handleBtStateChange(intent, startId);
-            return START_NOT_STICKY;
-        }
-
-        /*
-         * This assumes that the intent sender has checked that this is a dock
-         * and that the intent is for a disconnect
-         */
-        final SharedPreferences prefs = getPrefs();
-        if (BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
-            BluetoothDevice disconnectedDevice = intent
-                    .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            int retryCount = prefs.getInt(KEY_CONNECT_RETRY_COUNT, 0);
-            if (retryCount < MAX_CONNECT_RETRY) {
-                prefs.edit().putInt(KEY_CONNECT_RETRY_COUNT, retryCount + 1).apply();
-                handleUnexpectedDisconnect(disconnectedDevice, mProfileManager.getHeadsetProfile(), startId);
-            }
-            return START_NOT_STICKY;
-        } else if (BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
-            BluetoothDevice disconnectedDevice = intent
-                    .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-
-            int retryCount = prefs.getInt(KEY_CONNECT_RETRY_COUNT, 0);
-            if (retryCount < MAX_CONNECT_RETRY) {
-                prefs.edit().putInt(KEY_CONNECT_RETRY_COUNT, retryCount + 1).apply();
-                handleUnexpectedDisconnect(disconnectedDevice, mProfileManager.getA2dpProfile(), startId);
-            }
-            return START_NOT_STICKY;
-        }
-
-        Message msg = parseIntent(intent);
-        if (msg == null) {
-            // Bad intent
-            if (DEBUG) Log.d(TAG, "START_NOT_STICKY - Bad intent.");
-            DockEventReceiver.finishStartingService(this, startId);
-            return START_NOT_STICKY;
-        }
-
-        if (msg.what == MSG_TYPE_DOCKED) {
-            prefs.edit().remove(KEY_CONNECT_RETRY_COUNT).apply();
-        }
-
-        msg.arg2 = startId;
-        processMessage(msg);
-
-        return START_NOT_STICKY;
-    }
-
-    private final class ServiceHandler extends Handler {
-        private ServiceHandler(Looper looper) {
-            super(looper);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            processMessage(msg);
-        }
-    }
-
-    // This method gets messages from both onStartCommand and mServiceHandler/mServiceLooper
-    private synchronized void processMessage(Message msg) {
-        int msgType = msg.what;
-        final int state = msg.arg1;
-        final int startId = msg.arg2;
-        BluetoothDevice device = null;
-        if (msg.obj != null) {
-            device = (BluetoothDevice) msg.obj;
-        }
-
-        if(DEBUG) Log.d(TAG, "processMessage: " + msgType + " state: " + state + " device = "
-                + (device == null ? "null" : device.toString()));
-
-        boolean deferFinishCall = false;
-
-        switch (msgType) {
-            case MSG_TYPE_SHOW_UI:
-                if (device != null) {
-                    createDialog(device, state, startId);
-                }
-                break;
-
-            case MSG_TYPE_DOCKED:
-                deferFinishCall = msgTypeDocked(device, state, startId);
-                break;
-
-            case MSG_TYPE_UNDOCKED_PERMANENT:
-                deferFinishCall = msgTypeUndockedPermanent(device, startId);
-                break;
-
-            case MSG_TYPE_UNDOCKED_TEMPORARY:
-                msgTypeUndockedTemporary(device, state, startId);
-                break;
-
-            case MSG_TYPE_DISABLE_BT:
-                deferFinishCall = msgTypeDisableBluetooth(startId);
-                break;
-        }
-
-        if (mDialog == null && mPendingDevice == null && msgType != MSG_TYPE_UNDOCKED_TEMPORARY
-                && !deferFinishCall) {
-            // NOTE: We MUST not call stopSelf() directly, since we need to
-            // make sure the wake lock acquired by the Receiver is released.
-            DockEventReceiver.finishStartingService(this, startId);
-        }
-    }
-
-    private boolean msgTypeDisableBluetooth(int startId) {
-        if (DEBUG) {
-            Log.d(TAG, "BT DISABLE");
-        }
-        final SharedPreferences prefs = getPrefs();
-        if (mLocalAdapter.disable()) {
-            prefs.edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
-            return false;
-        } else {
-            // disable() returned an error. Persist a flag to disable BT later
-            prefs.edit().putBoolean(KEY_DISABLE_BT, true).apply();
-            mPendingTurnOffStartId = startId;
-            if(DEBUG) {
-                Log.d(TAG, "disable failed. try again later " + startId);
-            }
-            return true;
-        }
-    }
-
-    private void msgTypeUndockedTemporary(BluetoothDevice device, int state,
-            int startId) {
-        // Undocked event received. Queue a delayed msg to sever connection
-        Message newMsg = mServiceHandler.obtainMessage(MSG_TYPE_UNDOCKED_PERMANENT, state,
-                startId, device);
-        mServiceHandler.sendMessageDelayed(newMsg, UNDOCKED_GRACE_PERIOD);
-    }
-
-    private boolean msgTypeUndockedPermanent(BluetoothDevice device, int startId) {
-        // Grace period passed. Disconnect.
-        handleUndocked(device);
-        if (device != null) {
-            final SharedPreferences prefs = getPrefs();
-
-            if (DEBUG) {
-                Log.d(TAG, "DISABLE_BT_WHEN_UNDOCKED = "
-                        + prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false));
-            }
-
-            if (prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false)) {
-                if (hasOtherConnectedDevices(device)) {
-                    // Don't disable BT if something is connected
-                    prefs.edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
-                } else {
-                    // BT was disabled when we first docked
-                    if (DEBUG) {
-                        Log.d(TAG, "QUEUED BT DISABLE");
-                    }
-                    // Queue a delayed msg to disable BT
-                    Message newMsg = mServiceHandler.obtainMessage(
-                            MSG_TYPE_DISABLE_BT, 0, startId, null);
-                    mServiceHandler.sendMessageDelayed(newMsg,
-                            DISABLE_BT_GRACE_PERIOD);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean msgTypeDocked(BluetoothDevice device, final int state,
-            final int startId) {
-        if (DEBUG) {
-            // TODO figure out why hasMsg always returns false if device
-            // is supplied
-            Log.d(TAG, "1 Has undock perm msg = "
-                    + mServiceHandler.hasMessages(MSG_TYPE_UNDOCKED_PERMANENT, mDevice));
-            Log.d(TAG, "2 Has undock perm msg = "
-                    + mServiceHandler.hasMessages(MSG_TYPE_UNDOCKED_PERMANENT, device));
-        }
-
-        mServiceHandler.removeMessages(MSG_TYPE_UNDOCKED_PERMANENT);
-        mServiceHandler.removeMessages(MSG_TYPE_DISABLE_BT);
-        getPrefs().edit().remove(KEY_DISABLE_BT).apply();
-
-        if (device != null) {
-            if (!device.equals(mDevice)) {
-                if (mDevice != null) {
-                    // Not expected. Cleanup/undock existing
-                    handleUndocked(mDevice);
-                }
-
-                mDevice = device;
-
-                // Register first in case LocalBluetoothProfileManager
-                // becomes ready after isManagerReady is called and it
-                // would be too late to register a service listener.
-                mProfileManager.addServiceListener(this);
-                if (mProfileManager.isManagerReady()) {
-                    handleDocked(device, state, startId);
-                    // Not needed after all
-                    mProfileManager.removeServiceListener(this);
-                } else {
-                    final BluetoothDevice d = device;
-                    mRunnable = new Runnable() {
-                        public void run() {
-                            handleDocked(d, state, startId);  // FIXME: WTF runnable here?
-                        }
-                    };
-                    return true;
-                }
-            }
-        } else {
-            // display dialog to enable dock for media audio only in the case of low end docks and
-            // if not already selected by user
-            int dockAudioMediaEnabled = Settings.Global.getInt(getContentResolver(),
-                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, -1);
-            if (dockAudioMediaEnabled == -1 &&
-                    state == Intent.EXTRA_DOCK_STATE_LE_DESK) {
-                handleDocked(null, state, startId);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    synchronized boolean hasOtherConnectedDevices(BluetoothDevice dock) {
-        Collection<CachedBluetoothDevice> cachedDevices = mDeviceManager.getCachedDevicesCopy();
-        Set<BluetoothDevice> btDevices = mLocalAdapter.getBondedDevices();
-        if (btDevices == null || cachedDevices == null || btDevices.isEmpty()) {
-            return false;
-        }
-        if(DEBUG) {
-            Log.d(TAG, "btDevices = " + btDevices.size());
-            Log.d(TAG, "cachedDeviceUIs = " + cachedDevices.size());
-        }
-
-        for (CachedBluetoothDevice deviceUI : cachedDevices) {
-            BluetoothDevice btDevice = deviceUI.getDevice();
-            if (!btDevice.equals(dock) && btDevices.contains(btDevice) && deviceUI
-                    .isConnected()) {
-                if(DEBUG) Log.d(TAG, "connected deviceUI = " + deviceUI.getName());
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private Message parseIntent(Intent intent) {
-        BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-        int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, -1234);
-
-        if (DEBUG) {
-            Log.d(TAG, "Action: " + intent.getAction() + " State:" + state
-                    + " Device: " + (device == null ? "null" : device.getAliasName()));
-        }
-
-        int msgType;
-        switch (state) {
-            case Intent.EXTRA_DOCK_STATE_UNDOCKED:
-                msgType = MSG_TYPE_UNDOCKED_TEMPORARY;
-                break;
-            case Intent.EXTRA_DOCK_STATE_DESK:
-            case Intent.EXTRA_DOCK_STATE_HE_DESK:
-            case Intent.EXTRA_DOCK_STATE_CAR:
-                if (device == null) {
-                    Log.w(TAG, "device is null");
-                    return null;
-                }
-                /// Fall Through ///
-            case Intent.EXTRA_DOCK_STATE_LE_DESK:
-                if (DockEventReceiver.ACTION_DOCK_SHOW_UI.equals(intent.getAction())) {
-                    if (device == null) {
-                        Log.w(TAG, "device is null");
-                        return null;
-                    }
-                    msgType = MSG_TYPE_SHOW_UI;
-                } else {
-                    msgType = MSG_TYPE_DOCKED;
-                }
-                break;
-            default:
-                return null;
-        }
-
-        return mServiceHandler.obtainMessage(msgType, state, 0, device);
-    }
-
-    private void createDialog(BluetoothDevice device,
-            int state, int startId) {
-        if (mDialog != null) {
-            // Shouldn't normally happen
-            mDialog.dismiss();
-            mDialog = null;
-        }
-        mDevice = device;
-        switch (state) {
-            case Intent.EXTRA_DOCK_STATE_CAR:
-            case Intent.EXTRA_DOCK_STATE_DESK:
-            case Intent.EXTRA_DOCK_STATE_LE_DESK:
-            case Intent.EXTRA_DOCK_STATE_HE_DESK:
-                break;
-            default:
-                return;
-        }
-
-        startForeground(0, new Notification());
-
-        final AlertDialog.Builder ab = new AlertDialog.Builder(this);
-        View view;
-        LayoutInflater inflater = (LayoutInflater)getSystemService(LAYOUT_INFLATER_SERVICE);
-
-        mAudioMediaCheckbox = null;
-
-        if (device != null) {
-            // Device in a new dock.
-            boolean firstTime =
-                    !LocalBluetoothPreferences.hasDockAutoConnectSetting(this, device.getAddress());
-
-            CharSequence[] items = initBtSettings(device, state, firstTime);
-
-            ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
-
-            // Profiles
-            ab.setMultiChoiceItems(items, mCheckedItems, mMultiClickListener);
-
-            // Remember this settings
-            view = inflater.inflate(R.layout.remember_dock_setting, null);
-            CheckBox rememberCheckbox = (CheckBox) view.findViewById(R.id.remember);
-
-            // check "Remember setting" by default if no value was saved
-            boolean checked = firstTime ||
-                    LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress());
-            rememberCheckbox.setChecked(checked);
-            rememberCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
-            if (DEBUG) {
-                Log.d(TAG, "Auto connect = "
-                  + LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress()));
-            }
-        } else {
-            ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
-
-            view = inflater.inflate(R.layout.dock_audio_media_enable_dialog, null);
-            mAudioMediaCheckbox =
-                    (CheckBox) view.findViewById(R.id.dock_audio_media_enable_cb);
-
-            boolean checked = Settings.Global.getInt(getContentResolver(),
-                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1;
-
-            mAudioMediaCheckbox.setChecked(checked);
-            mAudioMediaCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
-        }
-
-        float pixelScaleFactor = getResources().getDisplayMetrics().density;
-        int viewSpacingLeft = (int) (14 * pixelScaleFactor);
-        int viewSpacingRight = (int) (14 * pixelScaleFactor);
-        ab.setView(view, viewSpacingLeft, 0 /* top */, viewSpacingRight, 0 /* bottom */);
-
-        // Ok Button
-        ab.setPositiveButton(getString(android.R.string.ok), mClickListener);
-
-        mStartIdAssociatedWithDialog = startId;
-        mDialog = ab.create();
-        mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
-        mDialog.setOnDismissListener(mDismissListener);
-        mDialog.show();
-    }
-
-    // Called when the individual bt profiles are clicked.
-    private final DialogInterface.OnMultiChoiceClickListener mMultiClickListener =
-            new DialogInterface.OnMultiChoiceClickListener() {
-                public void onClick(DialogInterface dialog, int which, boolean isChecked) {
-                    if (DEBUG) {
-                        Log.d(TAG, "Item " + which + " changed to " + isChecked);
-                    }
-                    mCheckedItems[which] = isChecked;
-                }
-            };
-
-
-    // Called when the "Remember" Checkbox is clicked
-    private final CompoundButton.OnCheckedChangeListener mCheckedChangeListener =
-            new CompoundButton.OnCheckedChangeListener() {
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    if (DEBUG) {
-                        Log.d(TAG, "onCheckedChanged: Remember Settings = " + isChecked);
-                    }
-                    if (mDevice != null) {
-                        LocalBluetoothPreferences.saveDockAutoConnectSetting(
-                                DockService.this, mDevice.getAddress(), isChecked);
-                    } else {
-                        Settings.Global.putInt(getContentResolver(),
-                                Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, isChecked ? 1 : 0);
-                    }
-                }
-            };
-
-
-    // Called when the dialog is dismissed
-    private final DialogInterface.OnDismissListener mDismissListener =
-            new DialogInterface.OnDismissListener() {
-                public void onDismiss(DialogInterface dialog) {
-                    // NOTE: We MUST not call stopSelf() directly, since we need to
-                    // make sure the wake lock acquired by the Receiver is released.
-                    if (mPendingDevice == null) {
-                        DockEventReceiver.finishStartingService(
-                                DockService.this, mStartIdAssociatedWithDialog);
-                    }
-                    stopForeground(true);
-                }
-            };
-
-    // Called when clicked on the OK button
-    private final DialogInterface.OnClickListener mClickListener =
-            new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    if (which == DialogInterface.BUTTON_POSITIVE) {
-                        if (mDevice != null) {
-                            if (!LocalBluetoothPreferences
-                                    .hasDockAutoConnectSetting(
-                                            DockService.this,
-                                            mDevice.getAddress())) {
-                                LocalBluetoothPreferences
-                                        .saveDockAutoConnectSetting(
-                                                DockService.this,
-                                                mDevice.getAddress(), true);
-                            }
-
-                            applyBtSettings(mDevice, mStartIdAssociatedWithDialog);
-                        } else if (mAudioMediaCheckbox != null) {
-                            Settings.Global.putInt(getContentResolver(),
-                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
-                                    mAudioMediaCheckbox.isChecked() ? 1 : 0);
-                        }
-                    }
-                }
-            };
-
-    private CharSequence[] initBtSettings(BluetoothDevice device,
-            int state, boolean firstTime) {
-        // TODO Avoid hardcoding dock and profiles. Read from system properties
-        int numOfProfiles;
-        switch (state) {
-            case Intent.EXTRA_DOCK_STATE_DESK:
-            case Intent.EXTRA_DOCK_STATE_LE_DESK:
-            case Intent.EXTRA_DOCK_STATE_HE_DESK:
-                numOfProfiles = 1;
-                break;
-            case Intent.EXTRA_DOCK_STATE_CAR:
-                numOfProfiles = 2;
-                break;
-            default:
-                return null;
-        }
-
-        mProfiles = new LocalBluetoothProfile[numOfProfiles];
-        mCheckedItems = new boolean[numOfProfiles];
-        CharSequence[] items = new CharSequence[numOfProfiles];
-
-        // FIXME: convert switch to something else
-        switch (state) {
-            case Intent.EXTRA_DOCK_STATE_CAR:
-                items[0] = getString(R.string.bluetooth_dock_settings_headset);
-                items[1] = getString(R.string.bluetooth_dock_settings_a2dp);
-                mProfiles[0] = mProfileManager.getHeadsetProfile();
-                mProfiles[1] = mProfileManager.getA2dpProfile();
-                if (firstTime) {
-                    // Enable by default for car dock
-                    mCheckedItems[0] = true;
-                    mCheckedItems[1] = true;
-                } else {
-                    mCheckedItems[0] = mProfiles[0].isPreferred(device);
-                    mCheckedItems[1] = mProfiles[1].isPreferred(device);
-                }
-                break;
-
-            case Intent.EXTRA_DOCK_STATE_DESK:
-            case Intent.EXTRA_DOCK_STATE_LE_DESK:
-            case Intent.EXTRA_DOCK_STATE_HE_DESK:
-                items[0] = getString(R.string.bluetooth_dock_settings_a2dp);
-                mProfiles[0] = mProfileManager.getA2dpProfile();
-                if (firstTime) {
-                    // Disable by default for desk dock
-                    mCheckedItems[0] = false;
-                } else {
-                    mCheckedItems[0] = mProfiles[0].isPreferred(device);
-                }
-                break;
-        }
-        return items;
-    }
-
-    // TODO: move to background thread to fix strict mode warnings
-    private void handleBtStateChange(Intent intent, int startId) {
-        int btState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
-        synchronized (this) {
-            if(DEBUG) Log.d(TAG, "BtState = " + btState + " mPendingDevice = " + mPendingDevice);
-            if (btState == BluetoothAdapter.STATE_ON) {
-                handleBluetoothStateOn(startId);
-            } else if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
-                // Remove the flag to disable BT if someone is turning off bt.
-                // The rational is that:
-                // a) if BT is off at undock time, no work needs to be done
-                // b) if BT is on at undock time, the user wants it on.
-                getPrefs().edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
-                DockEventReceiver.finishStartingService(this, startId);
-            } else if (btState == BluetoothAdapter.STATE_OFF) {
-                // Bluetooth was turning off as we were trying to turn it on.
-                // Let's try again
-                if(DEBUG) Log.d(TAG, "Bluetooth = OFF mPendingDevice = " + mPendingDevice);
-
-                if (mPendingTurnOffStartId != INVALID_STARTID) {
-                    DockEventReceiver.finishStartingService(this, mPendingTurnOffStartId);
-                    getPrefs().edit().remove(KEY_DISABLE_BT).apply();
-                    mPendingTurnOffStartId = INVALID_STARTID;
-                }
-
-                if (mPendingDevice != null) {
-                    mLocalAdapter.enable();
-                    mPendingTurnOnStartId = startId;
-                } else {
-                    DockEventReceiver.finishStartingService(this, startId);
-                }
-            }
-        }
-    }
-
-    private void handleBluetoothStateOn(int startId) {
-        if (mPendingDevice != null) {
-            if (mPendingDevice.equals(mDevice)) {
-                if(DEBUG) {
-                    Log.d(TAG, "applying settings");
-                }
-                applyBtSettings(mPendingDevice, mPendingStartId);
-            } else if(DEBUG) {
-                Log.d(TAG, "mPendingDevice  (" + mPendingDevice + ") != mDevice ("
-                        + mDevice + ')');
-            }
-
-            mPendingDevice = null;
-            DockEventReceiver.finishStartingService(this, mPendingStartId);
-        } else {
-            final SharedPreferences prefs = getPrefs();
-            if (DEBUG) {
-                Log.d(TAG, "A DISABLE_BT_WHEN_UNDOCKED = "
-                        + prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false));
-            }
-            // Reconnect if docked and bluetooth was enabled by user.
-            Intent i = registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-            if (i != null) {
-                int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE,
-                        Intent.EXTRA_DOCK_STATE_UNDOCKED);
-                if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                    BluetoothDevice device = i
-                            .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                    if (device != null) {
-                        connectIfEnabled(device);
-                    }
-                } else if (prefs.getBoolean(KEY_DISABLE_BT, false)
-                        && mLocalAdapter.disable()) {
-                    mPendingTurnOffStartId = startId;
-                    prefs.edit().remove(KEY_DISABLE_BT).apply();
-                    return;
-                }
-            }
-        }
-
-        if (mPendingTurnOnStartId != INVALID_STARTID) {
-            DockEventReceiver.finishStartingService(this, mPendingTurnOnStartId);
-            mPendingTurnOnStartId = INVALID_STARTID;
-        }
-
-        DockEventReceiver.finishStartingService(this, startId);
-    }
-
-    private synchronized void handleUnexpectedDisconnect(BluetoothDevice disconnectedDevice,
-            LocalBluetoothProfile profile, int startId) {
-        if (DEBUG) {
-            Log.d(TAG, "handling failed connect for " + disconnectedDevice);
-        }
-
-            // Reconnect if docked.
-            if (disconnectedDevice != null) {
-                // registerReceiver can't be called from a BroadcastReceiver
-                Intent intent = registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-                if (intent != null) {
-                    int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE,
-                            Intent.EXTRA_DOCK_STATE_UNDOCKED);
-                    if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                        BluetoothDevice dockedDevice = intent
-                                .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                        if (dockedDevice != null && dockedDevice.equals(disconnectedDevice)) {
-                            CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(
-                                    dockedDevice);
-                            cachedDevice.connectProfile(profile);
-                        }
-                    }
-                }
-            }
-
-            DockEventReceiver.finishStartingService(this, startId);
-    }
-
-    private synchronized void connectIfEnabled(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(
-                device);
-        List<LocalBluetoothProfile> profiles = cachedDevice.getConnectableProfiles();
-        for (LocalBluetoothProfile profile : profiles) {
-            if (profile.getPreferred(device) == BluetoothProfile.PRIORITY_AUTO_CONNECT) {
-                cachedDevice.connect(false);
-                return;
-            }
-        }
-    }
-
-    private synchronized void applyBtSettings(BluetoothDevice device, int startId) {
-        if (device == null || mProfiles == null || mCheckedItems == null
-                || mLocalAdapter == null) {
-            return;
-        }
-
-        // Turn on BT if something is enabled
-        for (boolean enable : mCheckedItems) {
-            if (enable) {
-                int btState = mLocalAdapter.getBluetoothState();
-                if (DEBUG) {
-                    Log.d(TAG, "BtState = " + btState);
-                }
-                // May have race condition as the phone comes in and out and in the dock.
-                // Always turn on BT
-                mLocalAdapter.enable();
-
-                // if adapter was previously OFF, TURNING_OFF, or TURNING_ON
-                if (btState != BluetoothAdapter.STATE_ON) {
-                    if (mPendingDevice != null && mPendingDevice.equals(mDevice)) {
-                        return;
-                    }
-
-                    mPendingDevice = device;
-                    mPendingStartId = startId;
-                    if (btState != BluetoothAdapter.STATE_TURNING_ON) {
-                        getPrefs().edit().putBoolean(
-                                KEY_DISABLE_BT_WHEN_UNDOCKED, true).apply();
-                    }
-                    return;
-                }
-            }
-        }
-
-        mPendingDevice = null;
-
-        boolean callConnect = false;
-        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(
-                device);
-        for (int i = 0; i < mProfiles.length; i++) {
-            LocalBluetoothProfile profile = mProfiles[i];
-            if (DEBUG) Log.d(TAG, profile.toString() + " = " + mCheckedItems[i]);
-
-            if (mCheckedItems[i]) {
-                // Checked but not connected
-                callConnect = true;
-            } else if (!mCheckedItems[i]) {
-                // Unchecked, may or may not be connected.
-                int status = profile.getConnectionStatus(cachedDevice.getDevice());
-                if (status == BluetoothProfile.STATE_CONNECTED) {
-                    if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting");
-                    cachedDevice.disconnect(mProfiles[i]);
-                }
-            }
-            profile.setPreferred(device, mCheckedItems[i]);
-            if (DEBUG) {
-                if (mCheckedItems[i] != profile.isPreferred(device)) {
-                    Log.e(TAG, "Can't save preferred value");
-                }
-            }
-        }
-
-        if (callConnect) {
-            if (DEBUG) Log.d(TAG, "applyBtSettings - Connecting");
-            cachedDevice.connect(false);
-        }
-    }
-
-    private synchronized void handleDocked(BluetoothDevice device, int state,
-            int startId) {
-        if (device != null &&
-                LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress())) {
-            // Setting == auto connect
-            initBtSettings(device, state, false);
-            applyBtSettings(mDevice, startId);
-        } else {
-            createDialog(device, state, startId);
-        }
-    }
-
-    private synchronized void handleUndocked(BluetoothDevice device) {
-        mRunnable = null;
-        mProfileManager.removeServiceListener(this);
-        if (mDialog != null) {
-            mDialog.dismiss();
-            mDialog = null;
-        }
-        mDevice = null;
-        mPendingDevice = null;
-        if (device != null) {
-            CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(device);
-            cachedDevice.disconnect();
-        }
-    }
-
-    private CachedBluetoothDevice getCachedBluetoothDevice(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-        if (cachedDevice == null) {
-            cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
-        }
-        return cachedDevice;
-    }
-
-    public synchronized void onServiceConnected() {
-        if (mRunnable != null) {
-            mRunnable.run();
-            mRunnable = null;
-            mProfileManager.removeServiceListener(this);
-        }
-    }
-
-    public void onServiceDisconnected() {
-        // FIXME: shouldn't I do something on service disconnected too?
-    }
-
-    public static class DockBluetoothCallback implements BluetoothCallback {
-        private final Context mContext;
-
-        public DockBluetoothCallback(Context context) {
-            mContext = context;
-        }
-
-        public void onBluetoothStateChanged(int bluetoothState) { }
-        public void onDeviceAdded(CachedBluetoothDevice cachedDevice) { }
-        public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) { }
-        public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
-        public void onScanningStateChanged(boolean started) { }
-
-        @Override
-        public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
-            BluetoothDevice device = cachedDevice.getDevice();
-            if (bondState == BluetoothDevice.BOND_NONE) {
-                if (device.isBluetoothDock()) {
-                    // After a dock is unpaired, we will forget the settings
-                    LocalBluetoothPreferences
-                            .removeDockAutoConnectSetting(mContext, device.getAddress());
-
-                    // if the device is undocked, remove it from the list as well
-                    if (!device.getAddress().equals(getDockedDeviceAddress(mContext))) {
-                        cachedDevice.setVisible(false);
-                    }
-                }
-            }
-        }
-
-        // This can't be called from a broadcast receiver where the filter is set in the Manifest.
-        private static String getDockedDeviceAddress(Context context) {
-            // This works only because these broadcast intents are "sticky"
-            Intent i = context.registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-            if (i != null) {
-                int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE, Intent.EXTRA_DOCK_STATE_UNDOCKED);
-                if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                    BluetoothDevice device = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                    if (device != null) {
-                        return device.getAddress();
-                    }
-                }
-            }
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 6a0bdcf..19eb200 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -44,8 +44,6 @@
 
     private static final String KEY_LAST_SELECTED_DEVICE_TIME = "last_selected_device_time";
 
-    private static final String KEY_DOCK_AUTO_CONNECT = "auto_connect_to_dock";
-
     private static final String KEY_DISCOVERABLE_END_TIMESTAMP = "discoverable_end_timestamp";
 
     private LocalBluetoothPreferences() {
@@ -147,25 +145,4 @@
         editor.putLong(KEY_DISCOVERABLE_END_TIMESTAMP, endTimestamp);
         editor.apply();
     }
-
-    static boolean hasDockAutoConnectSetting(Context context, String addr) {
-        return getSharedPreferences(context).contains(KEY_DOCK_AUTO_CONNECT + addr);
-    }
-
-    static boolean getDockAutoConnectSetting(Context context, String addr) {
-        return getSharedPreferences(context).getBoolean(KEY_DOCK_AUTO_CONNECT + addr,
-                false);
-    }
-
-    static void saveDockAutoConnectSetting(Context context, String addr, boolean autoConnect) {
-        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
-        editor.putBoolean(KEY_DOCK_AUTO_CONNECT + addr, autoConnect);
-        editor.apply();
-    }
-
-    static void removeDockAutoConnectSetting(Context context, String addr) {
-        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
-        editor.remove(KEY_DOCK_AUTO_CONNECT + addr);
-        editor.apply();
-    }
 }
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index b692852..4fa44b4 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -24,7 +24,6 @@
 import android.widget.Toast;
 
 import com.android.settings.R;
-import com.android.settings.bluetooth.DockService.DockBluetoothCallback;
 import com.android.settings.search.Index;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -85,11 +84,6 @@
 
     // TODO: wire this up to show connection errors...
     static void showConnectingError(Context context, String name) {
-        // if (!mIsConnectingErrorPossible) {
-        //     return;
-        // }
-        // mIsConnectingErrorPossible = false;
-
         showError(context, name, R.string.bluetooth_connecting_error_message);
     }
 
@@ -147,8 +141,6 @@
         @Override
         public void onBluetoothManagerInitialized(Context appContext,
                 LocalBluetoothManager bluetoothManager) {
-            bluetoothManager.getEventManager().registerCallback(
-                    new DockBluetoothCallback(appContext));
             com.android.settingslib.bluetooth.Utils.setErrorListener(mErrorListener);
         }
     };
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 6136bbf..f3f0f87 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -120,6 +120,7 @@
 import com.android.settings.tts.TextToSpeechSettings;
 import com.android.settings.users.UserSettings;
 import com.android.settings.vpn2.VpnSettings;
+import com.android.settings.webview.WebViewAppPicker;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.wifi.ConfigureWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
@@ -246,6 +247,7 @@
             AppAndNotificationDashboardFragment.class.getName(),
             UserAndAccountDashboardFragment.class.getName(),
             EnterprisePrivacySettings.class.getName(),
+            WebViewAppPicker.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/DashboardTilePreference.java b/src/com/android/settings/dashboard/DashboardTilePreference.java
deleted file mode 100644
index 918cf08..0000000
--- a/src/com/android/settings/dashboard/DashboardTilePreference.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.android.settings.DividerPreference;
-import com.android.settings.R;
-
-/**
- * A {@code Preference} styled as a dashboard tile.
- */
-public class DashboardTilePreference extends DividerPreference {
-
-    public DashboardTilePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public DashboardTilePreference(Context context) {
-        super(context);
-        init();
-    }
-
-    private void init() {
-        setLayoutResource(R.layout.dashboard_tile);
-        setDividerAllowedAbove(false);
-        setDividerAllowedBelow(false);
-    }
-
-}
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index ff97e31..bff0882 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -47,17 +47,13 @@
     private static final String KEY_DELETION_HELPER = "deletion_helper";
     private static final String KEY_FREED = "freed_bytes";
     private static final String KEY_STORAGE_MANAGER_SWITCH = "storage_manager_active";
-    private static final String KEY_DOWNLOADS_BACKUP_SWITCH = "downloads_backup_active";
-    private static final String KEY_DOWNLOADS_DAYS = "downloads_days";
     private static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY =
             "ro.storage_manager.enabled";
 
     private DropDownPreference mDaysToRetain;
-    private DropDownPreference mDownloadsDaysToRetain;
     private Preference mFreedBytes;
     private Preference mDeletionHelper;
     private SwitchPreference mStorageManagerSwitch;
-    private SwitchPreference mDownloadsBackupSwitch;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -71,9 +67,6 @@
         mDaysToRetain = (DropDownPreference) findPreference(KEY_DAYS);
         mDaysToRetain.setOnPreferenceChangeListener(this);
 
-        mDownloadsDaysToRetain = (DropDownPreference) findPreference(KEY_DOWNLOADS_DAYS);
-        mDownloadsDaysToRetain.setOnPreferenceChangeListener(this);
-
         mFreedBytes = findPreference(KEY_FREED);
 
         mDeletionHelper = findPreference(KEY_DELETION_HELPER);
@@ -82,9 +75,6 @@
         mStorageManagerSwitch = (SwitchPreference) findPreference(KEY_STORAGE_MANAGER_SWITCH);
         mStorageManagerSwitch.setOnPreferenceChangeListener(this);
 
-        mDownloadsBackupSwitch = (SwitchPreference) findPreference(KEY_DOWNLOADS_BACKUP_SWITCH);
-        mDownloadsBackupSwitch.setOnPreferenceChangeListener(this);
-
         ContentResolver cr = getContentResolver();
         int photosDaysToRetain = Settings.Secure.getInt(cr,
                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
@@ -93,12 +83,6 @@
                 getResources().getStringArray(R.array.automatic_storage_management_days_values);
         mDaysToRetain.setValue(stringValues[daysValueToIndex(photosDaysToRetain, stringValues)]);
 
-        int downloadsDaysToRetain = Settings.Secure.getInt(cr,
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN,
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT);
-        mDownloadsDaysToRetain.setValue(stringValues[daysValueToIndex(downloadsDaysToRetain,
-                stringValues)]);
-
         long freedBytes = Settings.Secure.getLong(cr,
                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,
                 0);
@@ -124,11 +108,6 @@
                         Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
         mStorageManagerSwitch.setChecked(isStorageManagerChecked);
         mDaysToRetain.setEnabled(isStorageManagerChecked);
-
-        boolean isDownloadsBackupChecked =
-                Settings.Secure.getInt(getContentResolver(),
-                        Settings.Secure.DOWNLOADS_BACKUP_ENABLED, 0) != 0;
-        mDownloadsBackupSwitch.setChecked(isDownloadsBackupChecked);
     }
 
     @Override
@@ -147,21 +126,11 @@
                     maybeShowWarning();
                 }
                 break;
-            case KEY_DOWNLOADS_BACKUP_SWITCH:
-                boolean downloadsBackupChecked = (boolean) newValue;
-                Settings.Secure.putInt(getContentResolver(),
-                        Settings.Secure.DOWNLOADS_BACKUP_ENABLED, downloadsBackupChecked ? 1 : 0);
-                break;
             case KEY_DAYS:
                 Settings.Secure.putInt(getContentResolver(),
                         Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
                         Integer.parseInt((String) newValue));
                 break;
-            case KEY_DOWNLOADS_DAYS:
-                Settings.Secure.putInt(getContentResolver(),
-                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN,
-                        Integer.parseInt((String) newValue));
-                break;
         }
         return true;
     }
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index ea196ad..6ec1b73 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -17,9 +17,7 @@
 package com.android.settings.deviceinfo;
 
 import android.content.Context;
-import android.content.Loader;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.provider.SearchIndexableResource;
@@ -29,7 +27,6 @@
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.deviceinfo.storage.AppsAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
 import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
@@ -37,7 +34,6 @@
 import com.android.settings.search.Indexable;
 import com.android.settings.widget.FooterPreference;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
-import com.android.settingslib.drawer.CategoryKey;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -88,7 +84,6 @@
         mSummaryController.updateBytes(usedBytes, totalSize);
         mPreferenceController.setVolume(mVolume);
         mPreferenceController.setSystemSize(systemSize);
-        mPreferenceController.startMeasurement();
 
         // Initialize the footer preference to go to the smart storage management.
         final FooterPreference pref = mFooterPreferenceMixin.createFooterPreference();
@@ -120,7 +115,7 @@
         controllers.add(mSummaryController);
 
         StorageManager sm = context.getSystemService(StorageManager.class);
-        mPreferenceController = new StorageItemPreferenceController(context, getLifecycle(), this,
+        mPreferenceController = new StorageItemPreferenceController(context, this,
                 mVolume, new StorageManagerVolumeProvider(sm));
         controllers.add(mPreferenceController);
         controllers.add(new ManageStoragePreferenceController(context));
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index b79560a..cf70429 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -59,10 +58,10 @@
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
 import java.io.File;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -513,10 +512,13 @@
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
         private final Context mContext;
         private final SummaryLoader mLoader;
+        private final StorageManagerVolumeProvider mStorageManagerVolumeProvider;
 
         private SummaryProvider(Context context, SummaryLoader loader) {
             mContext = context;
             mLoader = loader;
+            final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
+            mStorageManagerVolumeProvider = new StorageManagerVolumeProvider(storageManager);
         }
 
         @Override
@@ -528,13 +530,13 @@
 
         private void updateSummary() {
             // TODO: Register listener.
-            final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
-            PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
-                    new StorageManagerVolumeProvider(storageManager));
-            long privateUsedBytes = info.totalBytes - info.freeBytes;
+            final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
+            final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
+                    mStorageManagerVolumeProvider);
+            double privateUsedBytes = info.totalBytes - info.freeBytes;
             mLoader.setSummary(this, mContext.getString(R.string.storage_summary,
-                    Formatter.formatFileSize(mContext, privateUsedBytes),
-                    Formatter.formatFileSize(mContext, info.totalBytes)));
+                    percentageFormat.format(privateUsedBytes / info.totalBytes),
+                    Formatter.formatFileSize(mContext, info.freeBytes)));
         }
     }
 
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index e648b39..2011638 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -24,6 +24,7 @@
 import android.hardware.usb.UsbPortStatus;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
 
 public class UsbBackend {
 
@@ -41,7 +42,6 @@
     private final boolean mRestrictedBySystem;
     private final boolean mMidi;
 
-    private UserManager mUserManager;
     private UsbManager mUsbManager;
     private UsbPort mPort;
     private UsbPortStatus mPortStatus;
@@ -49,20 +49,26 @@
     private boolean mIsUnlocked;
 
     public UsbBackend(Context context) {
+        this(context, new UserRestrictionUtil(context));
+    }
+
+    @VisibleForTesting
+    UsbBackend(Context context, UserRestrictionUtil userRestrictionUtil) {
         Intent intent = context.registerReceiver(null,
                 new IntentFilter(UsbManager.ACTION_USB_STATE));
         mIsUnlocked = intent == null ?
                 false : intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
 
-        mUserManager = UserManager.get(context);
         mUsbManager = context.getSystemService(UsbManager.class);
 
-        mRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
-        mRestrictedBySystem = mUserManager.hasBaseUserRestriction(
-                UserManager.DISALLOW_USB_FILE_TRANSFER, UserHandle.of(UserHandle.myUserId()));
+        mRestricted = userRestrictionUtil.isUsbFileTransferRestricted();
+        mRestrictedBySystem = userRestrictionUtil.isUsbFileTransferRestrictedBySystem();
         mMidi = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);
 
         UsbPort[] ports = mUsbManager.getPorts();
+        if (ports == null) {
+            return;
+        }
         // For now look for a connected port, in the future we should identify port in the
         // notification and pick based on that.
         final int N = ports.length;
@@ -172,4 +178,22 @@
         // No port, support sink modes only.
         return (mode & MODE_POWER_MASK) != MODE_POWER_SOURCE;
     }
+
+    // Wrapper class to enable testing with UserManager APIs
+    public static class UserRestrictionUtil {
+        private UserManager mUserManager;
+
+        public UserRestrictionUtil(Context context) {
+            mUserManager = UserManager.get(context);
+        }
+
+        public boolean isUsbFileTransferRestricted() {
+            return mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        }
+
+        public boolean isUsbFileTransferRestrictedBySystem() {
+            return mUserManager.hasBaseUserRestriction(
+                UserManager.DISALLOW_USB_FILE_TRANSFER, UserHandle.of(UserHandle.myUserId()));
+        }
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/storage/AppsAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
similarity index 73%
rename from src/com/android/settings/deviceinfo/storage/AppsAsyncLoader.java
rename to src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
index cbedb08..b16590e 100644
--- a/src/com/android/settings/deviceinfo/storage/AppsAsyncLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
@@ -16,8 +16,12 @@
 
 package com.android.settings.deviceinfo.storage;
 
+import static android.content.pm.ApplicationInfo.CATEGORY_AUDIO;
+import static android.content.pm.ApplicationInfo.CATEGORY_GAME;
+
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.os.UserHandle;
 import android.util.ArraySet;
 
 import com.android.settings.applications.PackageManagerWrapper;
@@ -29,13 +33,13 @@
  * AppsAsyncLoader is a Loader which loads app storage information and categories it by the app's
  * specified categorization.
  */
-public class AppsAsyncLoader extends AsyncLoader<AppsAsyncLoader.AppsStorageResult> {
+public class StorageAsyncLoader extends AsyncLoader<StorageAsyncLoader.AppsStorageResult> {
     private int mUserId;
     private String mUuid;
     private StorageStatsSource mStatsManager;
     private PackageManagerWrapper mPackageManager;
 
-    public AppsAsyncLoader(Context context, int userId, String uuid, StorageStatsSource source,
+    public StorageAsyncLoader(Context context, int userId, String uuid, StorageStatsSource source,
             PackageManagerWrapper pm) {
         super(context);
         mUserId = userId;
@@ -66,12 +70,20 @@
             StorageStatsSource.AppStorageStats stats = mStatsManager.getStatsForUid(mUuid, app.uid);
             // Note: This omits cache intentionally -- we are not attributing it to the apps.
             long appSize = stats.getCodeBytes() + stats.getDataBytes();
-            if (app.category == ApplicationInfo.CATEGORY_GAME) {
-                result.gamesSize += appSize;
-            } else {
-                result.otherAppsSize += appSize;
+            switch (app.category) {
+                case CATEGORY_GAME:
+                    result.gamesSize += appSize;
+                    break;
+                case CATEGORY_AUDIO:
+                    result.musicAppsSize += appSize;
+                    break;
+                default:
+                    result.otherAppsSize += appSize;
+                    break;
             }
         }
+
+        result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(mUserId));
         return result;
     }
 
@@ -81,6 +93,8 @@
 
     public static class AppsStorageResult {
         public long gamesSize;
+        public long musicAppsSize;
         public long otherAppsSize;
+        public StorageStatsSource.ExternalStorageStats externalStats;
     }
 }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 5437dcb..627b877 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -18,13 +18,11 @@
 
 import android.app.Fragment;
 import android.app.LoaderManager;
-import android.app.usage.StorageStatsManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Loader;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.VolumeInfo;
@@ -40,23 +38,17 @@
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 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 com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settingslib.deviceinfo.StorageMeasurement;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import java.util.HashMap;
 
-
 /**
  * StorageItemPreferenceController handles the storage line items which summarize the storage
  * categorization breakdown.
  */
 public class StorageItemPreferenceController extends PreferenceController
-        implements StorageMeasurement.MeasurementReceiver, LifecycleObserver, OnDestroy,
-        LoaderManager.LoaderCallbacks<AppsAsyncLoader.AppsStorageResult> {
+        implements LoaderManager.LoaderCallbacks<StorageAsyncLoader.AppsStorageResult> {
     private static final String TAG = "StorageItemPreference";
 
     private static final String IMAGE_MIME_TYPE = "image/*";
@@ -78,9 +70,7 @@
     private final StorageVolumeProvider mSvp;
     private VolumeInfo mVolume;
     private final int mUserId;
-    private StorageMeasurement mMeasure;
     private long mSystemSize;
-    private long mUsedSize;
 
     private StorageItemPreferenceAlternate mPhotoPreference;
     private StorageItemPreferenceAlternate mAudioPreference;
@@ -91,8 +81,8 @@
 
     private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
 
-    public StorageItemPreferenceController(Context context, Lifecycle lifecycle,
-            Fragment hostFragment, VolumeInfo volume, StorageVolumeProvider svp) {
+    public StorageItemPreferenceController(
+            Context context, Fragment hostFragment, VolumeInfo volume, StorageVolumeProvider svp) {
         super(context);
         mFragment = hostFragment;
         mVolume = volume;
@@ -100,10 +90,6 @@
 
         UserManager um = mContext.getSystemService(UserManager.class);
         mUserId = um.getUserHandle();
-
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
     }
 
     @Override
@@ -166,44 +152,6 @@
     }
 
     @Override
-    public void onDetailsChanged(StorageMeasurement.MeasurementDetails details) {
-        final long imagesSize = totalValues(details, mUserId,
-                Environment.DIRECTORY_DCIM,
-                Environment.DIRECTORY_PICTURES,
-                Environment.DIRECTORY_MOVIES);
-        if (mPhotoPreference != null) {
-            mPhotoPreference.setStorageSize(imagesSize);
-        }
-
-        final long audioSize = totalValues(details, mUserId,
-                Environment.DIRECTORY_MUSIC,
-                Environment.DIRECTORY_ALARMS,
-                Environment.DIRECTORY_NOTIFICATIONS,
-                Environment.DIRECTORY_RINGTONES,
-                Environment.DIRECTORY_PODCASTS);
-        if (mAudioPreference != null) {
-            mAudioPreference.setStorageSize(audioSize);
-        }
-
-        if (mSystemPreference != null) {
-            mSystemPreference.setStorageSize(mSystemSize);
-        }
-
-        final long downloadsSize = totalValues(details, mUserId, Environment.DIRECTORY_DOWNLOADS);
-        final long miscSize = details.miscSize.get(mUserId);
-        if (mFilePreference != null) {
-            mFilePreference.setStorageSize(downloadsSize + miscSize);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        if (mMeasure != null) {
-            mMeasure.onDestroy();
-        }
-    }
-
-    @Override
     public void displayPreference(PreferenceScreen screen) {
         mPhotoPreference = (StorageItemPreferenceAlternate) screen.findPreference(PHOTO_KEY);
         mAudioPreference = (StorageItemPreferenceAlternate) screen.findPreference(AUDIO_KEY);
@@ -214,32 +162,30 @@
     }
 
     @Override
-    public Loader<AppsAsyncLoader.AppsStorageResult> onCreateLoader(int id,
+    public Loader<StorageAsyncLoader.AppsStorageResult> onCreateLoader(int id,
             Bundle args) {
-        return new AppsAsyncLoader(mContext, UserHandle.myUserId(), mVolume.fsUuid,
+        return new StorageAsyncLoader(mContext, UserHandle.myUserId(), mVolume.fsUuid,
                 new StorageStatsSource(mContext),
                 new PackageManagerWrapperImpl(mContext.getPackageManager()));
     }
 
     @Override
-    public void onLoadFinished(Loader<AppsAsyncLoader.AppsStorageResult> loader,
-            AppsAsyncLoader.AppsStorageResult data) {
+    public void onLoadFinished(Loader<StorageAsyncLoader.AppsStorageResult> loader,
+            StorageAsyncLoader.AppsStorageResult data) {
+        mPhotoPreference.setStorageSize(
+                data.externalStats.imageBytes + data.externalStats.videoBytes);
+        mAudioPreference.setStorageSize(data.musicAppsSize + data.externalStats.audioBytes);
         mGamePreference.setStorageSize(data.gamesSize);
         mAppPreference.setStorageSize(data.otherAppsSize);
+        mSystemPreference.setStorageSize(mSystemSize);
+
+        long unattributedBytes = data.externalStats.totalBytes - data.externalStats.audioBytes
+                - data.externalStats.videoBytes - data.externalStats.imageBytes;
+        mFilePreference.setStorageSize(unattributedBytes);
     }
 
     @Override
-    public void onLoaderReset(Loader<AppsAsyncLoader.AppsStorageResult> loader) {
-    }
-
-    /**
-     * Begins an asynchronous storage measurement task for the preferences.
-     */
-    public void startMeasurement() {
-        //TODO: When the GID-based measurement system is completed, swap in the GID impl.
-        mMeasure = new StorageMeasurement(mContext, mVolume, mSvp.findEmulatedForPrivate(mVolume));
-        mMeasure.setReceiver(this);
-        mMeasure.forceMeasure();
+    public void onLoaderReset(Loader<StorageAsyncLoader.AppsStorageResult> loader) {
     }
 
     /**
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index 0f36ab1..7cf0780 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -26,6 +26,7 @@
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.BatteryInfo;
 import com.android.settingslib.graph.UsageView;
 
@@ -49,12 +50,22 @@
 
     @Override
     public void performClick() {
-        mHelper.storeStatsHistoryInFile(BATTERY_HISTORY_FILE);
-        Bundle args = new Bundle();
-        args.putString(BatteryHistoryDetail.EXTRA_STATS, BATTERY_HISTORY_FILE);
-        args.putParcelable(BatteryHistoryDetail.EXTRA_BROADCAST, mHelper.getBatteryBroadcast());
-        Utils.startWithFragment(getContext(), BatteryHistoryDetail.class.getName(), args,
-                null, 0, R.string.history_details_title, null);
+        // TODO(b/34890746): remove this since history graph is not clickable
+        final Context context = getContext();
+        final PowerUsageFeatureProvider featureProvider = FeatureFactory.getFactory(context)
+                .getPowerUsageFeatureProvider(context);
+
+        if (featureProvider.isAdvancedUiEnabled()) {
+            Utils.startWithFragment(getContext(), PowerUsageAdvanced.class.getName(), null,
+                    null, 0, R.string.advanced_battery_title, null);
+        } else {
+            mHelper.storeStatsHistoryInFile(BATTERY_HISTORY_FILE);
+            Bundle args = new Bundle();
+            args.putString(BatteryHistoryDetail.EXTRA_STATS, BATTERY_HISTORY_FILE);
+            args.putParcelable(BatteryHistoryDetail.EXTRA_BROADCAST, mHelper.getBatteryBroadcast());
+            Utils.startWithFragment(getContext(), BatteryHistoryDetail.class.getName(), args,
+                    null, 0, R.string.history_details_title, null);
+        }
     }
 
     public void setStats(BatteryStatsHelper batteryStats) {
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index 9371a19..1d3d62b 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -20,6 +20,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -48,12 +49,21 @@
         mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
     }
 
+    public PowerGaugePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        final Drawable icon = context.getDrawable(R.drawable.ic_battery_circle);
+
+        setIcon(icon);
+        setWidgetLayoutResource(R.layout.preference_widget_summary);
+        mIconSize = icon.getIntrinsicWidth();
+    }
+
     public void setContentDescription(String name) {
         mContentDescription = name;
         notifyChanged();
     }
 
-    public void setPercent(double percentOfMax, double percentOfTotal) {
+    public void setPercent(double percentOfTotal) {
         mProgress = Utils.formatPercentage((int) (percentOfTotal + 0.5));
         notifyChanged();
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
new file mode 100644
index 0000000..4ccf9f7
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -0,0 +1,237 @@
+/*
+ * 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.fuelgauge;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Process;
+import android.provider.SearchIndexableResource;
+import android.support.annotation.ColorInt;
+import android.support.annotation.IntDef;
+import android.support.annotation.VisibleForTesting;
+import android.util.SparseArray;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatterySipper.DrainType;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class PowerUsageAdvanced extends PowerUsageBase {
+    private static final String TAG = "AdvancedBatteryUsage";
+    private static final String KEY_BATTERY_GRAPH = "battery_graph";
+    private static final String KEY_BATTERY_APPS = "battery_apps";
+    private static final String KEY_BATTERY_WIFI = "battery_wifi";
+    private static final String KEY_BATTERY_CELL = "battery_cell";
+    private static final String KEY_BATTERY_BLUETOOTH = "battery_bluetooth";
+    private static final String KEY_BATTERY_IDLE = "battery_idle";
+    private static final String KEY_BATTERY_SERVICE = "battery_service";
+    private static final String KEY_BATTERY_SYSTEM = "battery_system";
+    private static final String KEY_BATTERY_USER = "battery_user";
+
+    private BatteryHistoryPreference mHistPref;
+    @VisibleForTesting
+    SparseArray<String> mUsageTypeMap;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_GRAPH);
+        init();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshStats();
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.power_usage_advanced;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
+    @Override
+    protected void refreshStats() {
+        super.refreshStats();
+
+        updatePreference(mHistPref);
+
+        List<PowerUsageData> dataList = parsePowerUsageData(mStatsHelper);
+        for (int i = 0, size = dataList.size(); i < size; i++) {
+            final PowerUsageData data = dataList.get(i);
+            final String key = mUsageTypeMap.get(data.usageType);
+            if (key != null) {
+                bindData(key, data);
+            }
+        }
+    }
+
+    @VisibleForTesting
+    @UsageType int extractUsageType(BatterySipper sipper) {
+        final DrainType drainType = sipper.drainType;
+        final int uid = sipper.getUid();
+
+        // TODO(b/34385770): add logic to extract type service
+        if (drainType == DrainType.WIFI) {
+            return UsageType.WIFI;
+        } else if (drainType == DrainType.BLUETOOTH) {
+            return UsageType.BLUETOOTH;
+        } else if (drainType == DrainType.IDLE) {
+            return UsageType.IDLE;
+        } else if (drainType == DrainType.USER) {
+            return UsageType.USER;
+        } else if (drainType == DrainType.CELL) {
+            return UsageType.CELL;
+        } else if (uid == Process.SYSTEM_UID || uid == Process.ROOT_UID) {
+            return UsageType.SYSTEM;
+        } else {
+            return UsageType.APP;
+        }
+    }
+
+    @VisibleForTesting
+    void init() {
+        // Store projection from UsageType to preference key
+        mUsageTypeMap = new SparseArray<>();
+        mUsageTypeMap.put(UsageType.APP, KEY_BATTERY_APPS);
+        mUsageTypeMap.put(UsageType.WIFI, KEY_BATTERY_WIFI);
+        mUsageTypeMap.put(UsageType.CELL, KEY_BATTERY_CELL);
+        mUsageTypeMap.put(UsageType.BLUETOOTH, KEY_BATTERY_BLUETOOTH);
+        mUsageTypeMap.put(UsageType.IDLE, KEY_BATTERY_IDLE);
+        mUsageTypeMap.put(UsageType.SERVICE, KEY_BATTERY_SERVICE);
+        mUsageTypeMap.put(UsageType.USER, KEY_BATTERY_USER);
+        mUsageTypeMap.put(UsageType.SYSTEM, KEY_BATTERY_SYSTEM);
+    }
+
+    @VisibleForTesting
+    List<PowerUsageData> parsePowerUsageData(BatteryStatsHelper statusHelper) {
+        final List<BatterySipper> batterySippers = statusHelper.getUsageList();
+        final Map<Integer, PowerUsageData> batteryDataMap = new HashMap<>();
+
+        for (int i = 0, size = mUsageTypeMap.size(); i < size; i++) {
+            @UsageType final int type = mUsageTypeMap.keyAt(i);
+            batteryDataMap.put(type, PowerUsageData.createBatteryUsageData(type));
+        }
+
+        // Accumulate power usage based on usage type
+        for (final BatterySipper sipper : batterySippers) {
+            final PowerUsageData usageData = batteryDataMap.get(extractUsageType(sipper));
+            usageData.totalPowerMah += sipper.totalPowerMah;
+        }
+
+        // TODO(b/34385770): add logic to extract the summary
+        final List<PowerUsageData> batteryDataList = new ArrayList<>(batteryDataMap.values());
+        final double totalPower = statusHelper.getTotalPower();
+        for (final PowerUsageData usageData : batteryDataList) {
+            usageData.percentage = (usageData.totalPowerMah / totalPower) * 100;
+        }
+
+        return batteryDataList;
+    }
+
+    private void bindData(String key, PowerUsageData batteryData) {
+        final PowerGaugePreference pref = (PowerGaugePreference) findPreference(key);
+
+        pref.setSummary(batteryData.summary);
+        pref.setPercent(batteryData.percentage);
+    }
+
+    /**
+     * Class that contains data used in {@link PowerGaugePreference}.
+     */
+    @VisibleForTesting
+    static class PowerUsageData {
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef({UsageType.APP,
+                UsageType.WIFI,
+                UsageType.CELL,
+                UsageType.SERVICE,
+                UsageType.SYSTEM,
+                UsageType.BLUETOOTH,
+                UsageType.USER,
+                UsageType.IDLE})
+        public @interface UsageType {
+            int APP = 0;
+            int WIFI = 1;
+            int CELL = 2;
+            int SERVICE = 3;
+            int SYSTEM = 4;
+            int BLUETOOTH = 5;
+            int USER = 6;
+            int IDLE = 7;
+        }
+
+        public String summary;
+        public double percentage;
+        public double totalPowerMah;
+        @ColorInt
+        public int iconColor;
+        @UsageType
+        public int usageType;
+
+        private PowerUsageData(@UsageType int usageType) {
+            this.usageType = usageType;
+            totalPowerMah = 0;
+        }
+
+        public static PowerUsageData createBatteryUsageData(@UsageType int usageType) {
+            // TODO(b/34385770): add color logic in this part
+            return new PowerUsageData(usageType);
+        }
+    }
+
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
+                            .isEnabled()) {
+                        return null;
+                    }
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.power_usage_advanced;
+                    return Arrays.asList(sir);
+                }
+            };
+
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index de16fe5..3c1b197 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -36,4 +36,9 @@
    * Gets an {@link Intent} to show additional battery info.
    */
   Intent getAdditionalBatteryInfoIntent();
+
+  /**
+   * Check whether advanced ui is enabled
+   */
+  boolean isAdvancedUiEnabled();
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
new file mode 100644
index 0000000..b29900e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -0,0 +1,41 @@
+/*
+ * 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.fuelgauge;
+
+import android.content.Intent;
+
+public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
+    @Override
+    public boolean isLocationSettingEnabled(String[] packages) {
+        return false;
+    }
+
+    @Override
+    public boolean isAdditionalBatteryInfoEnabled() {
+        return false;
+    }
+
+    @Override
+    public Intent getAdditionalBatteryInfoIntent() {
+        return null;
+    }
+
+    @Override
+    public boolean isAdvancedUiEnabled() {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 2745292..309830b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -344,23 +344,20 @@
             final List<BatterySipper> usageList = getCoalescedUsageList(
                     USE_FAKE_DATA ? getFakeStats() : mStatsHelper.getUsageList());
 
-            final double screenPowerMah = removeScreenBatterySipper(usageList);
+            final double hiddenPowerMah = removeHiddenBatterySippers(usageList);
 
             final int dischargeAmount = USE_FAKE_DATA ? 5000
                     : stats != null ? stats.getDischargeAmount(mStatsType) : 0;
             final int numSippers = usageList.size();
             for (int i = 0; i < numSippers; i++) {
                 final BatterySipper sipper = usageList.get(i);
-                if (shouldHideSipper(sipper)) {
-                    continue;
-                }
-
-                // Deduct the screen power from total power, used to calculate percentOfTotal
+                // Deduct the power of hidden items from total power, which is used to
+                // calculate percentOfTotal
                 double totalPower = USE_FAKE_DATA ?
-                        4000 : mStatsHelper.getTotalPower() - screenPowerMah;
+                        4000 : mStatsHelper.getTotalPower() - hiddenPowerMah;
 
                 // With deduction in totalPower, percentOfTotal is higher because it adds the part
-                // used in screen
+                // used in screen, system, etc
                 final double percentOfTotal =
                         ((sipper.totalPowerMah / totalPower) * dischargeAmount);
 
@@ -413,7 +410,7 @@
                 sipper.percent = percentOfTotal;
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
-                pref.setPercent(percentOfMax, percentOfTotal);
+                pref.setPercent(percentOfTotal);
                 setUsageSummary(pref, usedTime, sipper.usageTimeMs);
                 if ((sipper.drainType != DrainType.APP
                         || sipper.uidObj.getUid() == Process.ROOT_UID)
@@ -451,7 +448,8 @@
         final int uid = sipper.getUid();
 
         return drainType == DrainType.IDLE || drainType == DrainType.CELL
-                || uid == Process.ROOT_UID || uid == Process.SYSTEM_UID
+                || drainType == DrainType.SCREEN || uid == Process.ROOT_UID
+                || uid == Process.SYSTEM_UID
                 || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP;
     }
 
@@ -470,16 +468,17 @@
     }
 
     @VisibleForTesting
-    double removeScreenBatterySipper(List<BatterySipper> sippers) {
-        for (int i = 0, size = sippers.size(); i < size; i++) {
+    double removeHiddenBatterySippers(List<BatterySipper> sippers) {
+        double totalPowerMah = 0;
+        for (int i = sippers.size() - 1; i >= 0; i--) {
             final BatterySipper sipper = sippers.get(i);
-            if (sipper.drainType == DrainType.SCREEN) {
+            if (shouldHideSipper(sipper)) {
                 sippers.remove(i);
-                return sipper.totalPowerMah;
+                totalPowerMah += sipper.totalPowerMah;
             }
         }
 
-        return 0;
+        return totalPowerMah;
     }
 
     private static List<BatterySipper> getFakeStats() {
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 2d91414..d2b0621 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -20,6 +20,8 @@
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
@@ -42,6 +44,8 @@
 
     private static final String TAG = "NetworkDashboardFrag";
 
+    private NetworkResetActionMenuController mNetworkResetController;
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY;
@@ -58,13 +62,25 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mNetworkResetController = new NetworkResetActionMenuController(context);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        mNetworkResetController.buildMenuItem(menu);
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final AirplaneModePreferenceController airplaneModePreferenceController =
                 new AirplaneModePreferenceController(context, this /* fragment */);
         final MobilePlanPreferenceController mobilePlanPreferenceController =
                 new MobilePlanPreferenceController(context, this);
         final WifiMasterSwitchPreferenceController wifiPreferenceController =
-            new WifiMasterSwitchPreferenceController(context, mMetricsFeatureProvider);
+                new WifiMasterSwitchPreferenceController(context, mMetricsFeatureProvider);
         final Lifecycle lifecycle = getLifecycle();
         lifecycle.addObserver(airplaneModePreferenceController);
         lifecycle.addObserver(mobilePlanPreferenceController);
@@ -75,8 +91,6 @@
         controllers.add(new MobileNetworkPreferenceController(context));
         controllers.add(new TetherPreferenceController(context));
         controllers.add(new VpnPreferenceController(context));
-        controllers.add(new WifiCallingPreferenceController(context));
-        controllers.add(new NetworkResetPreferenceController(context));
         controllers.add(new ProxyPreferenceController(context));
         controllers.add(mobilePlanPreferenceController);
         controllers.add(wifiPreferenceController);
diff --git a/src/com/android/settings/network/NetworkResetActionMenuController.java b/src/com/android/settings/network/NetworkResetActionMenuController.java
new file mode 100644
index 0000000..67c37a4
--- /dev/null
+++ b/src/com/android/settings/network/NetworkResetActionMenuController.java
@@ -0,0 +1,59 @@
+/*
+ * 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.os.UserHandle;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+import com.android.settings.ResetNetwork;
+import com.android.settings.Utils;
+import com.android.settingslib.RestrictedLockUtils;
+
+public class NetworkResetActionMenuController {
+
+    private static final int MENU_NETWORK_RESET = Menu.FIRST + 200;
+    private final Context mContext;
+
+    public NetworkResetActionMenuController(Context context) {
+        mContext = context;
+    }
+
+    public void buildMenuItem(Menu menu) {
+        MenuItem item = null;
+        if (isAvailable() && menu != null) {
+            item = menu.add(0, MENU_NETWORK_RESET, 0, R.string.reset_network_title);
+        }
+        if (item != null) {
+            item.setOnMenuItemClickListener(target -> {
+                Utils.startWithFragment(mContext, ResetNetwork.class.getName(), null, null,
+                        0, R.string.reset_network_title, null);
+                return true;
+            });
+        }
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    boolean isAvailable() {
+        return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
+    }
+}
diff --git a/src/com/android/settings/network/NetworkResetPreferenceController.java b/src/com/android/settings/network/NetworkResetPreferenceController.java
deleted file mode 100644
index e357fbe..0000000
--- a/src/com/android/settings/network/NetworkResetPreferenceController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.network;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.core.PreferenceController;
-import com.android.settingslib.RestrictedLockUtils;
-
-public class NetworkResetPreferenceController extends PreferenceController {
-
-    private static final String KEY_NETWORK_RESET = "network_reset";
-
-    public NetworkResetPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
-                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_NETWORK_RESET;
-    }
-}
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index ef62fbb..0d7fb93 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.notification;
 
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
 import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -24,6 +27,7 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
@@ -41,10 +45,12 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.text.Collator;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -55,16 +61,11 @@
     private static final String TAG = "AppNotificationSettings";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
-            = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES);
-
-    private static final String KEY_CHANNELS = "channels";
     private static final String KEY_BLOCK = "block";
 
     private DashboardFeatureProvider mDashboardFeatureProvider;
-    private PreferenceCategory mChannels;
     private List<NotificationChannelGroup> mChannelGroupList;
+    private List<PreferenceCategory> mChannelGroups = new ArrayList();
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -98,7 +99,6 @@
 
         mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
         mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
-        mChannels = (PreferenceCategory) findPreference(KEY_CHANNELS);
 
         if (mPkgInfo != null) {
             setupBlock();
@@ -107,60 +107,19 @@
             ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
             rows.put(mAppRow.pkg, mAppRow);
             collectConfigActivities(rows);
-            // TODO: load channels in asynctask?
-            mChannelGroupList = mBackend.getChannelGroups(mPkg, mUid).getList();
-            Collections.sort(mChannelGroupList, mChannelGroupComparator);
-
-            if (mChannelGroupList.isEmpty()) {
-                Preference empty = new Preference(getPrefContext());
-                empty.setTitle(R.string.no_channels);
-                empty.setEnabled(false);
-                mChannels.addPreference(empty);
-            } else {
-                for (NotificationChannelGroup group : mChannelGroupList) {
-                    PreferenceCategory groupCategory = null;
-                    if (group.getId() != null && group.getName() != null) {
-                        groupCategory = new PreferenceCategory(getPrefContext());
-                        groupCategory.setTitle(group.getName());
-                        groupCategory.setKey(group.getId());
-                        groupCategory.setOrderingAsAdded(true);
-                        getPreferenceScreen().addPreference(groupCategory);
-                    }
-                    final List<NotificationChannel> channels = group.getChannels();
-                    Collections.sort(channels, mChannelComparator);
-                    int N = channels.size();
-                    for (int i = 0; i < N; i++) {
-                        final NotificationChannel channel = channels.get(i);
-                        RestrictedPreference channelPref = new RestrictedPreference(
-                                getPrefContext());
-                        channelPref.setDisabledByAdmin(mSuspendedAppsAdmin);
-                        channelPref.setKey(channel.getId());
-                        channelPref.setTitle(channel.getName());
-
-                        if (channel.isDeleted()) {
-                            channelPref.setTitle(
-                                    getString(R.string.deleted_channel_name, channel.getName()));
-                            channelPref.setEnabled(false);
-                        } else {
-                            Bundle channelArgs = new Bundle();
-                            channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-                            channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
-                            channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
-                            channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
-                            Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
-                                    ChannelNotificationSettings.class.getName(),
-                                    channelArgs, null, 0, null, false);
-                            channelPref.setIntent(channelIntent);
-                        }
-                        if (groupCategory != null) {
-                            groupCategory.addPreference(channelPref);
-                        } else {
-                            mChannels.addPreference(channelPref);
-                        }
-                    }
+            new AsyncTask<Void, Void, Void>() {
+                @Override
+                protected Void doInBackground(Void... unused) {
+                    mChannelGroupList = mBackend.getChannelGroups(mPkg, mUid).getList();
+                    Collections.sort(mChannelGroupList, mChannelGroupComparator);
+                    return null;
                 }
-            }
-            updateDependents(mAppRow.banned);
+
+                @Override
+                protected void onPostExecute(Void unused) {
+                    populateChannelList();
+                }
+            }.execute();
         }
         if (mDashboardFeatureProvider.isEnabled()) {
             final Preference pref = FeatureFactory.getFactory(activity)
@@ -188,6 +147,83 @@
         }
     }
 
+    private void populateChannelList() {
+        if (mChannelGroupList.isEmpty()) {
+            PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
+            groupCategory.setTitle(R.string.notification_channels);
+            getPreferenceScreen().addPreference(groupCategory);
+            mChannelGroups.add(groupCategory);
+
+            Preference empty = new Preference(getPrefContext());
+            empty.setTitle(R.string.no_channels);
+            empty.setEnabled(false);
+            groupCategory.addPreference(empty);
+        } else {
+            for (NotificationChannelGroup group : mChannelGroupList) {
+                PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
+                if (group.getName() == null) {
+                    groupCategory.setTitle(mChannelGroupList.size() > 1
+                            ? R.string.notification_channels_other
+                            : R.string.notification_channels);
+                } else {
+                    groupCategory.setTitle(group.getName());
+                }
+                groupCategory.setKey(group.getId());
+                groupCategory.setOrderingAsAdded(true);
+                getPreferenceScreen().addPreference(groupCategory);
+                mChannelGroups.add(groupCategory);
+
+                final List<NotificationChannel> channels = group.getChannels();
+                Collections.sort(channels, mChannelComparator);
+                int N = channels.size();
+                for (int i = 0; i < N; i++) {
+                    final NotificationChannel channel = channels.get(i);
+                    MasterSwitchPreference channelPref = new MasterSwitchPreference(
+                            getPrefContext());
+                    channelPref.setDisabledByAdmin(mSuspendedAppsAdmin);
+                    channelPref.setKey(channel.getId());
+                    channelPref.setTitle(channel.getName());
+                    channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
+
+                    if (channel.isDeleted()) {
+                        channelPref.setTitle(
+                                getString(R.string.deleted_channel_name, channel.getName()));
+                        channelPref.setEnabled(false);
+                    } else {
+                        channelPref.setSummary(getImportanceSummary(channel.getImportance()));
+                        Bundle channelArgs = new Bundle();
+                        channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
+                        channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
+                        channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
+                        channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
+                        Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+                                ChannelNotificationSettings.class.getName(),
+                                channelArgs, null, 0, null, false);
+                        channelPref.setIntent(channelIntent);
+
+                        channelPref.setOnPreferenceChangeListener(
+                                new Preference.OnPreferenceChangeListener() {
+                                    @Override
+                                    public boolean onPreferenceChange(Preference preference,
+                                            Object o) {
+                                        boolean value = (Boolean) o;
+                                        int importance = value ?  IMPORTANCE_LOW : IMPORTANCE_NONE;
+                                        channel.setImportance(importance);
+                                        channel.lockFields(
+                                                NotificationChannel.USER_LOCKED_IMPORTANCE);
+                                        mBackend.updateChannel(mPkg, mUid, channel);
+
+                                        return true;
+                                    }
+                                });
+                    }
+                    groupCategory.addPreference(channelPref);
+                }
+            }
+        }
+        updateDependents(mAppRow.banned);
+    }
+
     private void setupBadge() {
         mBadge.setDisabledByAdmin(mSuspendedAppsAdmin);
         mBadge.setChecked(mAppRow.showBadge);
@@ -223,48 +259,10 @@
     }
 
     private void updateDependents(boolean banned) {
-        setVisible(mChannels, !banned);
-        setVisible(mBadge, !banned);
-    }
-
-    private List<ResolveInfo> queryNotificationConfigActivities() {
-        if (DEBUG) Log.d(TAG, "APP_NOTIFICATION_PREFS_CATEGORY_INTENT is "
-                + APP_NOTIFICATION_PREFS_CATEGORY_INTENT);
-        final List<ResolveInfo> resolveInfos = mPm.queryIntentActivities(
-                APP_NOTIFICATION_PREFS_CATEGORY_INTENT,
-                0 //PackageManager.MATCH_DEFAULT_ONLY
-        );
-        return resolveInfos;
-    }
-
-    private void collectConfigActivities(ArrayMap<String, AppRow> rows) {
-        final List<ResolveInfo> resolveInfos = queryNotificationConfigActivities();
-        applyConfigActivities(rows, resolveInfos);
-    }
-
-    private void applyConfigActivities(ArrayMap<String, AppRow> rows,
-            List<ResolveInfo> resolveInfos) {
-        if (DEBUG) Log.d(TAG, "Found " + resolveInfos.size() + " preference activities"
-                + (resolveInfos.size() == 0 ? " ;_;" : ""));
-        for (ResolveInfo ri : resolveInfos) {
-            final ActivityInfo activityInfo = ri.activityInfo;
-            final ApplicationInfo appInfo = activityInfo.applicationInfo;
-            final AppRow row = rows.get(appInfo.packageName);
-            if (row == null) {
-                if (DEBUG) Log.v(TAG, "Ignoring notification preference activity ("
-                        + activityInfo.name + ") for unknown package "
-                        + activityInfo.packageName);
-                continue;
-            }
-            if (row.settingsIntent != null) {
-                if (DEBUG) Log.v(TAG, "Ignoring duplicate notification preference activity ("
-                        + activityInfo.name + ") for package "
-                        + activityInfo.packageName);
-                continue;
-            }
-            row.settingsIntent = new Intent(APP_NOTIFICATION_PREFS_CATEGORY_INTENT)
-                    .setClassName(activityInfo.packageName, activityInfo.name);
+        for (PreferenceCategory category : mChannelGroups) {
+            setVisible(category, !banned);
         }
+        setVisible(mBadge, !banned);
     }
 
     private Comparator<NotificationChannel> mChannelComparator =
@@ -289,7 +287,7 @@
 
                 @Override
                 public int compare(NotificationChannelGroup left, NotificationChannelGroup right) {
-                    // Non-groups channels (in placeholder group with a null id) come first
+                    // Non-grouped channels (in placeholder group with a null id) come last
                     if (left.getId() == null && right.getId() != null) {
                         return 1;
                     } else if (right.getId() == null && left.getId() != null) {
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 6fa833a..ea450f4 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -35,6 +35,7 @@
 import android.service.notification.NotificationListenerService.Ranking;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -98,6 +99,12 @@
                 FeatureFactory.getFactory(activity).getDashboardFeatureProvider(activity);
         addPreferencesFromResource(R.xml.channel_notification_settings);
 
+        // load settings intent
+        ArrayMap<String, NotificationBackend.AppRow>
+                rows = new ArrayMap<String, NotificationBackend.AppRow>();
+        rows.put(mAppRow.pkg, mAppRow);
+        collectConfigActivities(rows);
+
         mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
         mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
         mImportance = (RestrictedDropDownPreference) findPreference(KEY_IMPORTANCE);
@@ -127,8 +134,9 @@
                     .setSummary(mAppRow.label)
                     .setPackageName(mAppRow.pkg)
                     .setUid(mAppRow.uid)
+                    .setAppNotifPrefIntent(mAppRow.settingsIntent)
                     .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,
-                            AppHeaderController.ActionType.ACTION_NONE)
+                            AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
                     .done(getPrefContext());
             getPreferenceScreen().addPreference(pref);
         }
@@ -156,7 +164,7 @@
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 final boolean lights = (Boolean) newValue;
-                mChannel.setLights(lights);
+                mChannel.enableLights(lights);
                 mChannel.lockFields(NotificationChannel.USER_LOCKED_LIGHTS);
                 mBackend.updateChannel(mPkg, mUid, mChannel);
                 return true;
@@ -230,12 +238,12 @@
         List<String> values = new ArrayList<>();;
         for (int i = 0; i < numImportances; i++) {
             int importance = i + 1;
-            summaries.add(getSummary(importance));
+            summaries.add(getImportanceSummary(importance));
             values.add(String.valueOf(importance));
         }
         if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
             // Add option to reset to letting the app decide
-            summaries.add(getSummary(NotificationManager.IMPORTANCE_UNSPECIFIED));
+            summaries.add(getImportanceSummary(NotificationManager.IMPORTANCE_UNSPECIFIED));
             values.add(String.valueOf(NotificationManager.IMPORTANCE_UNSPECIFIED));
         }
         mImportance.setEntryValues(values.toArray(new String[0]));
@@ -256,25 +264,6 @@
         });
     }
 
-    private String getSummary(int importance) {
-        switch (importance) {
-            case NotificationManager.IMPORTANCE_UNSPECIFIED:
-                return getContext().getString(R.string.notification_importance_unspecified);
-            case NotificationManager.IMPORTANCE_NONE:
-                return getContext().getString(R.string.notification_importance_blocked);
-            case NotificationManager.IMPORTANCE_MIN:
-                return getContext().getString(R.string.notification_importance_min);
-            case NotificationManager.IMPORTANCE_LOW:
-                return getContext().getString(R.string.notification_importance_low);
-            case NotificationManager.IMPORTANCE_DEFAULT:
-                return getContext().getString(R.string.notification_importance_default);
-            case NotificationManager.IMPORTANCE_HIGH:
-            case NotificationManager.IMPORTANCE_MAX:
-            default:
-                return getContext().getString(R.string.notification_importance_high);
-        }
-    }
-
     protected void setupPriorityPref(boolean priority) {
         mPriority.setDisabledByAdmin(mSuspendedAppsAdmin);
         mPriority.setChecked(priority);
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index f6c6591..80d249f 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -23,28 +23,39 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
+import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.widget.Toast;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
+import java.util.List;
+
 abstract public class NotificationSettingsBase extends SettingsPreferenceFragment {
     private static final String TAG = "NotifiSettingsBase";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
+    private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
+            = new Intent(Intent.ACTION_MAIN)
+            .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES);
+
     protected static final String KEY_BLOCK = "block";
     protected static final String KEY_BADGE = "badge";
 
@@ -155,6 +166,49 @@
         getActivity().finish();
     }
 
+    private List<ResolveInfo> queryNotificationConfigActivities() {
+        if (DEBUG) Log.d(TAG, "APP_NOTIFICATION_PREFS_CATEGORY_INTENT is "
+                + APP_NOTIFICATION_PREFS_CATEGORY_INTENT);
+        final List<ResolveInfo> resolveInfos = mPm.queryIntentActivities(
+                APP_NOTIFICATION_PREFS_CATEGORY_INTENT,
+                0 //PackageManager.MATCH_DEFAULT_ONLY
+        );
+        return resolveInfos;
+    }
+
+    protected void collectConfigActivities(ArrayMap<String, NotificationBackend.AppRow> rows) {
+        final List<ResolveInfo> resolveInfos = queryNotificationConfigActivities();
+        applyConfigActivities(rows, resolveInfos);
+    }
+
+    private void applyConfigActivities(ArrayMap<String, NotificationBackend.AppRow> rows,
+            List<ResolveInfo> resolveInfos) {
+        if (DEBUG) Log.d(TAG, "Found " + resolveInfos.size() + " preference activities"
+                + (resolveInfos.size() == 0 ? " ;_;" : ""));
+        for (ResolveInfo ri : resolveInfos) {
+            final ActivityInfo activityInfo = ri.activityInfo;
+            final ApplicationInfo appInfo = activityInfo.applicationInfo;
+            final NotificationBackend.AppRow row = rows.get(appInfo.packageName);
+            if (row == null) {
+                if (DEBUG) Log.v(TAG, "Ignoring notification preference activity ("
+                        + activityInfo.name + ") for unknown package "
+                        + activityInfo.packageName);
+                continue;
+            }
+            if (row.settingsIntent != null) {
+                if (DEBUG) Log.v(TAG, "Ignoring duplicate notification preference activity ("
+                        + activityInfo.name + ") for package "
+                        + activityInfo.packageName);
+                continue;
+            }
+            row.settingsIntent = new Intent(APP_NOTIFICATION_PREFS_CATEGORY_INTENT)
+                    .setClassName(activityInfo.packageName, activityInfo.name);
+            if (mChannel != null) {
+                row.settingsIntent.putExtra(Notification.EXTRA_CHANNEL_ID, mChannel.getId());
+            }
+        }
+    }
+
     private PackageInfo findPackageInfo(String pkg, int uid) {
         if (pkg == null || uid < 0) {
             return null;
@@ -176,15 +230,22 @@
         return null;
     }
 
-    private PackageInfo findPackageInfo(String pkg) {
-        if (pkg == null) {
-            return null;
+    protected String getImportanceSummary(int importance) {
+        switch (importance) {
+            case NotificationManager.IMPORTANCE_UNSPECIFIED:
+                return getContext().getString(R.string.notification_importance_unspecified);
+            case NotificationManager.IMPORTANCE_NONE:
+                return getContext().getString(R.string.notification_importance_blocked);
+            case NotificationManager.IMPORTANCE_MIN:
+                return getContext().getString(R.string.notification_importance_min);
+            case NotificationManager.IMPORTANCE_LOW:
+                return getContext().getString(R.string.notification_importance_low);
+            case NotificationManager.IMPORTANCE_DEFAULT:
+                return getContext().getString(R.string.notification_importance_default);
+            case NotificationManager.IMPORTANCE_HIGH:
+            case NotificationManager.IMPORTANCE_MAX:
+            default:
+                return getContext().getString(R.string.notification_importance_high);
         }
-        try {
-            return mPm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES);
-        } catch (NameNotFoundException e) {
-            Log.w(TAG, "Failed to load package " + pkg, e);
-        }
-        return null;
     }
 }
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 1cf0ae6..c1a2159 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -16,14 +16,8 @@
 
 package com.android.settings.notification;
 
-import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -39,11 +33,9 @@
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 
-import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -109,7 +101,7 @@
     @Override
     protected int getPreferenceScreenResId() {
         return mDashboardFeatureProvider.isEnabled()
-            ? R.xml.ia_sound_settings : R.xml.sound_settings;
+                ? R.xml.ia_sound_settings : R.xml.sound_settings;
     }
 
     @Override
@@ -127,7 +119,7 @@
         controllers.add(new AlarmVolumePreferenceController(context, mVolumeCallback, lifecycle));
         controllers.add(new MediaVolumePreferenceController(context, mVolumeCallback, lifecycle));
         controllers.add(
-            new NotificationVolumePreferenceController(context, mVolumeCallback, lifecycle));
+                new NotificationVolumePreferenceController(context, mVolumeCallback, lifecycle));
         controllers.add(new RingVolumePreferenceController(context, mVolumeCallback, lifecycle));
 
         // === Phone & notification ringtone ===
@@ -198,7 +190,9 @@
                 mCurrent.stopSample();
             }
         }
-    };
+    }
+
+    ;
 
     // === Callbacks ===
 
@@ -220,130 +214,63 @@
         }
     }
 
-    // === Summary ===
-
-    private static class SummaryProvider extends BroadcastReceiver
-            implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final AudioManager mAudioManager;
-        private final SummaryLoader mSummaryLoader;
-        private final int maxVolume;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-            mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-            maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                IntentFilter filter = new IntentFilter();
-                filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);
-                filter.addAction(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
-                filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
-                filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
-                filter.addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION);
-                filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED);
-                mContext.registerReceiver(this, filter);
-            } else {
-                mContext.unregisterReceiver(this);
-            }
-        }
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final int ringerMode = mAudioManager.getRingerMode();
-            int resId;
-            String percent = "";
-            if (ringerMode == mAudioManager.RINGER_MODE_SILENT) {
-                resId = R.string.sound_settings_summary_silent;
-            } else if (ringerMode == mAudioManager.RINGER_MODE_VIBRATE){
-                resId = R.string.sound_settings_summary_vibrate;
-            }
-            else {
-                percent =  NumberFormat.getPercentInstance().format(
-                        (double) mAudioManager.getStreamVolume(
-                                AudioManager.STREAM_RING) / maxVolume);
-                resId = R.string.sound_settings_summary;
-            }
-
-            final ComponentName suppressor = NotificationManager.from(mContext)
-                    .getEffectsSuppressor();
-            if (suppressor != null) {
-                String suppressText = SuppressorHelper.getSuppressionText(mContext, suppressor);
-                mSummaryLoader.setSummary(this, suppressText);
-            } else {
-                mSummaryLoader.setSummary(this, mContext.getString(resId, percent));
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                SummaryLoader summaryLoader) {
-            return new SummaryProvider(activity, summaryLoader);
-        }
-    };
-
     // === Indexing ===
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
 
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.sound_settings;
-            return Arrays.asList(sir);
-        }
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.sound_settings;
+                    return Arrays.asList(sir);
+                }
 
-        public List<String> getNonIndexableKeys(Context context) {
-            final ArrayList<String> rt = new ArrayList<String>();
-            new NotificationVolumePreferenceController(
-                context, null /* Callback */, null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new RingVolumePreferenceController(
-                context, null /* Callback */, null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new PhoneRingtonePreferenceController(context).updateNonIndexableKeys(rt);
-            new VibrateWhenRingPreferenceController(context).updateNonIndexableKeys(rt);
-            new EmergencyBroadcastPreferenceController(context).updateNonIndexableKeys(rt);
-            if (FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
-                .isEnabled()) {
-                new DialPadTonePreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new ScreenLockSoundPreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new ChargingSoundPreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new DockingSoundPreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new TouchSoundPreferenceController(context, null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new VibrateOnTouchPreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new DockAudioMediaPreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-                new BootSoundPreferenceController(context).updateNonIndexableKeys(rt);
-                new EmergencyTonePreferenceController(context,
-                    null /* SettingsPreferenceFragment */,
-                    null /* Lifecycle */).updateNonIndexableKeys(rt);
-            } else {
-                new CastPreferenceController(context).updateNonIndexableKeys(rt);
-            }
+                public List<String> getNonIndexableKeys(Context context) {
+                    final ArrayList<String> rt = new ArrayList<String>();
+                    new NotificationVolumePreferenceController(
+                            context, null /* Callback */,
+                            null /* Lifecycle */).updateNonIndexableKeys(rt);
+                    new RingVolumePreferenceController(
+                            context, null /* Callback */,
+                            null /* Lifecycle */).updateNonIndexableKeys(rt);
+                    new PhoneRingtonePreferenceController(context).updateNonIndexableKeys(rt);
+                    new VibrateWhenRingPreferenceController(context).updateNonIndexableKeys(rt);
+                    new EmergencyBroadcastPreferenceController(context).updateNonIndexableKeys(rt);
+                    if (FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
+                            .isEnabled()) {
+                        new DialPadTonePreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new ScreenLockSoundPreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new ChargingSoundPreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new DockingSoundPreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new TouchSoundPreferenceController(context, null /*
+                        SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new VibrateOnTouchPreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new DockAudioMediaPreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                        new BootSoundPreferenceController(context).updateNonIndexableKeys(rt);
+                        new EmergencyTonePreferenceController(context,
+                                null /* SettingsPreferenceFragment */,
+                                null /* Lifecycle */).updateNonIndexableKeys(rt);
+                    } else {
+                        new CastPreferenceController(context).updateNonIndexableKeys(rt);
+                    }
 
-            return rt;
-        }
-    };
+                    return rt;
+                }
+            };
 
     // === Work Sound Settings ===
 
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index c45bf0e..4c81e30 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -37,6 +37,7 @@
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProviderImpl;
 import com.android.settings.search2.SearchFeatureProvider;
@@ -59,6 +60,7 @@
     private SearchFeatureProvider mSearchFeatureProvider;
     private SecurityFeatureProvider mSecurityFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
+    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -75,7 +77,10 @@
 
     @Override
     public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
-        return null;
+        if (mPowerUsageFeatureProvider == null) {
+            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl();
+        }
+        return mPowerUsageFeatureProvider;
     }
 
     @Override
diff --git a/src/com/android/settings/qstile/DevelopmentModeTile.java b/src/com/android/settings/qstile/DevelopmentModeTile.java
deleted file mode 100644
index 578ffd8..0000000
--- a/src/com/android/settings/qstile/DevelopmentModeTile.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.qstile;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-import android.view.IWindowManager;
-import android.view.ThreadedRenderer;
-import android.view.View;
-
-import android.view.WindowManagerGlobal;
-import com.android.internal.app.LocalePicker;
-import com.android.settings.DevelopmentSettings;
-
-import java.util.Map;
-
-public class DevelopmentModeTile extends TileService {
-
-    static final String SHARED_PREFERENCES_NAME = "development_mode_tile_settings";
-
-    private static final String SHOW_TOUCHES_KEY = "show_touches";
-    private static final String POINTER_LOCATION_KEY = "pointer_location";
-    private static final String DEBUG_LAYOUT_KEY = "debug_layout";
-    private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
-    private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
-    private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
-    private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
-    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
-    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
-    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
-    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
-
-    private DevModeProperties mProps = new DevModeProperties();
-
-    @Override
-    public void onStartListening() {
-        super.onStartListening();
-        refresh();
-    }
-
-    public void refresh() {
-        mProps.refreshState(this);
-        getQsTile().setState(mProps.isSet ? (mProps.allMatch
-            ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE) : Tile.STATE_UNAVAILABLE);
-        getQsTile().updateTile();
-    }
-
-    @Override
-    public void onClick() {
-        if (getQsTile().getState() == Tile.STATE_UNAVAILABLE) {
-            startActivityAndCollapse(new Intent(this, DevelopmentTileConfigActivity.class));
-            return;
-        }
-
-        boolean active = getQsTile().getState() == Tile.STATE_INACTIVE;
-        Map<String, ?> values =
-                getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE).getAll();
-        ContentResolver cr = getContentResolver();
-        for (Property prop : mProps.mSysProps) {
-            Object expected = values.get(prop.prefKey);
-            String value = active && !prop.isDefault(expected) ? expected.toString() : "false";
-            SystemProperties.set(prop.key, value);
-        }
-        for (Property prop : mProps.mSysSettings) {
-            boolean expectedTrue = active && !prop.isDefault(values.get(prop.prefKey));
-            Settings.System.putInt(cr, prop.key, expectedTrue ? 1 : 0);
-        }
-
-        boolean expectedGlobPropTrue = active &&
-                !mProps.mGlobProp.isDefault(values.get(mProps.mGlobProp.prefKey));
-        Settings.Global.putInt(cr, mProps.mGlobProp.key, expectedGlobPropTrue ? 1 : 0);
-        SystemProperties.set(mProps.mGlobProp.key, expectedGlobPropTrue ? "1" : "0");
-        LocalePicker.updateLocales(getResources().getConfiguration().getLocales());
-
-        IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
-        try {
-            // Update the various animation scale values to expected values or 1. mProps.mAnimScales
-            // is an ordered array, where the index corresponds to the individual property.
-            for (int i = 0; i < mProps.mAnimScales.length; i++) {
-                Object expected = values.get(mProps.mAnimScales[i]);
-                float expectedFloat = active && expected != null ?
-                        Float.parseFloat(expected.toString()) : 1;
-                wm.setAnimationScale(i, expectedFloat);
-            }
-        } catch (RemoteException e) { }
-
-        new DevelopmentSettings.SystemPropPoker().execute(); // Settings app magic
-        refresh();
-    }
-
-    static class DevModeProperties {
-
-        private final Property[] mSysProps = new Property[] {
-                new Property(View.DEBUG_LAYOUT_PROPERTY, DEBUG_LAYOUT_KEY),
-                new Property(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
-                        SHOW_HW_SCREEN_UPDATES_KEY),
-                new Property(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
-                        SHOW_HW_LAYERS_UPDATES_KEY),
-                new Property(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, DEBUG_HW_OVERDRAW_KEY),
-                new Property(ThreadedRenderer.PROFILE_PROPERTY, TRACK_FRAME_TIME_KEY),
-        };
-
-        private final Property[] mSysSettings = new Property[] {
-                new Property(Settings.System.SHOW_TOUCHES, SHOW_TOUCHES_KEY),
-                new Property(Settings.System.POINTER_LOCATION, POINTER_LOCATION_KEY),
-        };
-
-        private final Property mGlobProp =
-                new Property(Settings.Global.DEVELOPMENT_FORCE_RTL, FORCE_RTL_LAYOUT_KEY);
-
-        private final String[] mAnimScales = new String[] {
-                WINDOW_ANIMATION_SCALE_KEY,
-                TRANSITION_ANIMATION_SCALE_KEY,
-                ANIMATOR_DURATION_SCALE_KEY
-        };
-
-        /**
-         * True is the values of all the properties corresponds to the expected values. Updated when
-         * {@link #refreshState(Context)} is called.
-         */
-        public boolean allMatch;
-        /**
-         * True is at least one property has a non-default expected value. Updated when
-         * {@link #refreshState(Context)} is called. Not that if all properties have default
-         * expected value, then active and non-active state will be the same.
-         */
-        public boolean isSet;
-
-        public void refreshState(Context context) {
-            Map<String, ?> values =
-                    context.getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE).getAll();
-            allMatch = true;
-            // True if there is at least one non-default value.
-            isSet = false;
-
-            for (Property prop : mSysProps) {
-                Object expected = values.get(prop.prefKey);
-                String actual = SystemProperties.get(prop.key);
-                allMatch &= prop.isDefault(expected)
-                    ? prop.isDefault(actual) : expected.toString().equals(actual);
-                isSet |= !prop.isDefault(expected);
-            }
-
-            ContentResolver cr = context.getContentResolver();
-            for (Property prop : mSysSettings) {
-                boolean expectedTrue = !prop.isDefault(values.get(prop.prefKey));
-                isSet |= expectedTrue;
-                allMatch &= expectedTrue == (Settings.System.getInt(cr, prop.key, 0) != 0);
-            }
-
-            boolean expectedGlopPropTrue = !mGlobProp.isDefault(values.get(mGlobProp.prefKey));
-            isSet |= expectedGlopPropTrue;
-            allMatch &= expectedGlopPropTrue == (Settings.Global.getInt(cr, mGlobProp.key, 0) != 0);
-
-            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
-            try {
-                for (int i = 0; i < mAnimScales.length; i++) {
-                    Object expected = values.get(mAnimScales[i]);
-                    float expectedFloat = expected == null
-                        ? 1 : Float.parseFloat(expected.toString());
-                    isSet |= expectedFloat != 1;
-                    allMatch &= expectedFloat == wm.getAnimationScale(i);
-                }
-            } catch (RemoteException e) { }
-        }
-    }
-
-    private static class Property {
-        final String key;
-        final String prefKey;
-
-        Property(String key, String prefKey) {
-            this.key = key;
-            this.prefKey = prefKey;
-        }
-
-        boolean isDefault(Object value) {
-            if (value == null) {
-                return true;
-            }
-            String str = value.toString();
-            return str.equals("") || str.equals("false");
-        }
-    }
-}
diff --git a/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java b/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
index cc63026..5968d7a 100644
--- a/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
+++ b/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
@@ -16,16 +16,20 @@
 
 package com.android.settings.qstile;
 
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
 import android.os.Bundle;
-import android.view.View;
+import android.service.quicksettings.TileService;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
 
-import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.widget.SwitchBar;
 
 public class DevelopmentTileConfigActivity extends SettingsActivity {
 
@@ -42,35 +46,38 @@
         return (DevelopmentTileConfigFragment.class.getName().equals(fragmentName));
     }
 
-    public static class DevelopmentTileConfigFragment extends SettingsPreferenceFragment implements
-            SharedPreferences.OnSharedPreferenceChangeListener {
-
-        private DevelopmentModeTile.DevModeProperties mProps =
-                new DevelopmentModeTile.DevModeProperties();
-
-        private SwitchBar mSwitchBar;
-        private View mDisabledMessage;
+    public static class DevelopmentTileConfigFragment extends SettingsPreferenceFragment
+            implements Preference.OnPreferenceChangeListener {
 
         @Override
         public void onCreate(Bundle icicle) {
             super.onCreate(icicle);
-            getPreferenceManager()
-                    .setSharedPreferencesName(DevelopmentModeTile.SHARED_PREFERENCES_NAME);
-            addPreferencesFromResource(R.xml.development_tile_prefs);
-        }
 
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            mDisabledMessage = setPinnedHeaderView(R.layout.development_tile_config_header);
-            refreshHeader();
-        }
+            Context context = getPrefContext();
+            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(context));
+            getPreferenceScreen().removeAll();
 
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-            mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
-            mSwitchBar.setEnabled(false);
+            Intent intent = new Intent(TileService.ACTION_QS_TILE)
+                    .setPackage(context.getPackageName());
+            PackageManager pm = getPackageManager();
+            for (ResolveInfo info :
+                    pm.queryIntentServices(intent, PackageManager.MATCH_DISABLED_COMPONENTS)) {
+                ServiceInfo sInfo = info.serviceInfo;
+                int enabledSetting = pm.getComponentEnabledSetting(
+                        new ComponentName(sInfo.packageName, sInfo.name));
+                boolean checked = enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                        || ((enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+                        && sInfo.enabled);
+
+                SwitchPreference preference = new SwitchPreference(context);
+                preference.setTitle(sInfo.loadLabel(pm));
+                preference.setIcon(sInfo.icon);
+                preference.setKey(sInfo.name);
+                preference.setChecked(checked);
+                preference.setPersistent(false);
+                preference.setOnPreferenceChangeListener(this);
+                getPreferenceScreen().addPreference(preference);
+            }
         }
 
         @Override
@@ -79,37 +86,14 @@
         }
 
         @Override
-        public void onResume() {
-            super.onResume();
-            refreshHeader();
-            getPreferenceManager().getSharedPreferences()
-                    .registerOnSharedPreferenceChangeListener(this);
-        }
-
-        @Override
-        public void onPause() {
-            super.onPause();
-            getPreferenceManager().getSharedPreferences()
-                    .unregisterOnSharedPreferenceChangeListener(this);
-        }
-
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            refreshHeader();
-        }
-
-        private void refreshHeader() {
-            if (mSwitchBar != null && mDisabledMessage != null) {
-                mProps.refreshState(getActivity());
-                if (mProps.isSet) {
-                    mSwitchBar.show();
-                    mDisabledMessage.setVisibility(View.GONE);
-                } else {
-                    mSwitchBar.hide();
-                    mDisabledMessage.setVisibility(View.VISIBLE);
-                }
-                mSwitchBar.setChecked(mProps.allMatch);
-            }
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            ComponentName cn = new ComponentName(
+                    getPrefContext().getPackageName(), preference.getKey());
+            getPackageManager().setComponentEnabledSetting(cn, (Boolean) newValue
+                            ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
+            return true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/qstile/DevelopmentTiles.java b/src/com/android/settings/qstile/DevelopmentTiles.java
new file mode 100644
index 0000000..635e9f0
--- /dev/null
+++ b/src/com/android/settings/qstile/DevelopmentTiles.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.settings.qstile;
+
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import android.view.IWindowManager;
+import android.view.ThreadedRenderer;
+import android.view.View;
+import android.view.WindowManagerGlobal;
+
+import com.android.internal.app.LocalePicker;
+import com.android.settings.DevelopmentSettings;
+
+public abstract class DevelopmentTiles extends TileService {
+
+    protected abstract boolean isEnabled();
+
+    protected abstract void setIsEnabled(boolean isEnabled);
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+        refresh();
+    }
+
+    public void refresh() {
+        getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
+        getQsTile().updateTile();
+    }
+
+    @Override
+    public void onClick() {
+        setIsEnabled(getQsTile().getState() == Tile.STATE_INACTIVE);
+        new DevelopmentSettings.SystemPropPoker().execute(); // Settings app magic
+        refresh();
+    }
+
+    /**
+     * Tile to control the "Show layout bounds" developer setting
+     */
+    public static class ShowLayout extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            return SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false);
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, isEnabled ? "true" : "false");
+        }
+    }
+
+    /**
+     * Tile to control the "GPU profiling" developer setting
+     */
+    public static class GPUProfiling extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            final String value = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
+            return value.equals("visual_bars");
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY, isEnabled ? "visual_bars" : "");
+        }
+    }
+
+    /**
+     * Tile to control the "Force RTL" developer setting
+     */
+    public static class ForceRTL extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            return Settings.Global.getInt(
+                    getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0;
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            Settings.Global.putInt(
+                    getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? 1 : 0);
+            SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? "1" : "0");
+            LocalePicker.updateLocales(getResources().getConfiguration().getLocales());
+        }
+    }
+
+    /**
+     * Tile to control the "Animation speed" developer setting
+     */
+    public static class AnimationSpeed extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+            try {
+                return wm.getAnimationScale(0) != 1;
+            } catch (RemoteException e) { }
+            return false;
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+            float scale = isEnabled ? 10 : 1;
+            try {
+                wm.setAnimationScale(0, scale);
+                wm.setAnimationScale(1, scale);
+                wm.setAnimationScale(2, scale);
+            } catch (RemoteException e) { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 68a50f0..ada8200 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -47,6 +47,7 @@
 import com.android.settings.display.ScreenZoomSettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
+import com.android.settings.fuelgauge.PowerUsageAdvanced;
 import com.android.settings.fuelgauge.PowerUsageDetail;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.gestures.DoubleTapPowerSettings;
@@ -127,6 +128,7 @@
         addIndex(PowerUsageSummary.class,
                 R.xml.power_usage_summary, R.drawable.ic_settings_battery);
         addIndex(PowerUsageDetail.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery);
+        addIndex(PowerUsageAdvanced.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery);
         addIndex(BatterySaverSettings.class,
                 R.xml.battery_saver_settings, R.drawable.ic_settings_battery);
         addIndex(AdvancedAppSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index c46bc6f..2898ce2 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -23,10 +23,8 @@
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
 import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
-import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -64,34 +62,6 @@
     }
 
     /**
-     * For Summary
-     */
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final SummaryLoader mSummaryLoader;
-        private final LocaleFeatureProvider mLocaleFeatureProvider;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-            mLocaleFeatureProvider = FeatureFactory.getFactory(context).getLocaleFeatureProvider();
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                final String language = mContext.getString(
-                        R.string.system_dashboard_summary, mLocaleFeatureProvider.getLocaleNames());
-                mSummaryLoader.setSummary(this, language);
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
-            (context, summaryLoader) -> new SummaryProvider(context, summaryLoader);
-
-    /**
      * For Search.
      */
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index a794953..c49aa1d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -39,7 +39,6 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
@@ -66,7 +65,6 @@
 import com.android.settings.Utils;
 import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
 import com.android.settings.accounts.EmergencyInfoPreferenceController;
-import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -1060,36 +1058,6 @@
         mMePreference.setTitle(label);
     }
 
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final SummaryLoader mSummaryLoader;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
-                        UserHandle.myUserId());
-                mSummaryLoader.setSummary(this, mContext.getString(R.string.user_summary,
-                        info.name));
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                                                                   SummaryLoader summaryLoader) {
-            return new SummaryProvider(activity, summaryLoader);
-        }
-    };
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java
index e31a396..b45ae45 100644
--- a/src/com/android/settings/vpn2/ManageablePreference.java
+++ b/src/com/android/settings/vpn2/ManageablePreference.java
@@ -23,7 +23,7 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
-import com.android.settings.GearPreference;
+import com.android.settings.widget.GearPreference;
 import com.android.settings.R;
 
 /**
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 708b6c4..2998319 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -23,8 +23,8 @@
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.ConnectivityManager.NetworkCallback;
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
 import android.net.IConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -41,7 +41,6 @@
 import android.security.KeyStore;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
@@ -56,11 +55,12 @@
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
 import com.android.internal.util.ArrayUtils;
-import com.android.settings.GearPreference;
-import com.android.settings.GearPreference.OnGearClickListener;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.widget.GearPreference;
+import com.android.settings.widget.GearPreference.OnGearClickListener;
 import com.android.settingslib.RestrictedLockUtils;
+
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
diff --git a/src/com/android/settings/webview/WebViewAppListAdapter.java b/src/com/android/settings/webview/WebViewAppListAdapter.java
deleted file mode 100644
index 4c36a47..0000000
--- a/src/com/android/settings/webview/WebViewAppListAdapter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.webview;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.RemoteException;
-import android.graphics.Color;
-import android.support.annotation.VisibleForTesting;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-
-import com.android.settings.applications.AppViewHolder;
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Custom list adapter for Settings to choose WebView package.
- * Note: parts of this class are copied from AppPicker.java.
- */
-class WebViewAppListAdapter extends ArrayAdapter<WebViewApplicationInfo> {
-    private final LayoutInflater mInflater;
-    private final String mCurrentWebViewPackageName;
-
-    public WebViewAppListAdapter(Context context,
-            WebViewUpdateServiceWrapper webviewUpdateServiceWrapper) {
-        super(context, 0);
-        mInflater = LayoutInflater.from(context);
-
-        final List<WebViewApplicationInfo> packageInfoList =
-                new ArrayList<WebViewApplicationInfo>();
-        List<ApplicationInfo> pkgs =
-                webviewUpdateServiceWrapper.getValidWebViewApplicationInfos(getContext());
-        for (ApplicationInfo ai : pkgs) {
-            WebViewApplicationInfo info = new WebViewApplicationInfo(ai,
-                    ai.loadLabel(context.getPackageManager()).toString(),
-                    getDisabledReason(webviewUpdateServiceWrapper, context, ai.packageName));
-            packageInfoList.add(info);
-        }
-        addAll(packageInfoList);
-
-        PackageInfo currentWebViewPackage = webviewUpdateServiceWrapper.getCurrentWebViewPackage();
-        mCurrentWebViewPackageName =
-                currentWebViewPackage == null ? null : currentWebViewPackage.packageName;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        // A ViewHolder keeps references to children views to avoid unnecessary calls
-        // to findViewById() on each row.
-        AppViewHolder holder = AppViewHolder.createOrRecycle(mInflater, convertView);
-        convertView = holder.rootView;
-        WebViewApplicationInfo info = getItem(position);
-        holder.appName.setText(info.label);
-        if (info.info != null) {
-            holder.appIcon.setImageDrawable(info.info.loadIcon(getContext().getPackageManager()));
-            // Allow disable-description to wrap - to be able to show several lines of text in case
-            // a package is disabled/uninstalled for several users.
-            holder.summary.setSingleLine(false);
-            if (!isEnabled(position)) {
-                holder.summary.setText(info.disabledReason);
-            } else {
-                holder.summary.setText("");
-            }
-        } else {
-            holder.appIcon.setImageDrawable(null);
-            holder.summary.setText("");
-        }
-        holder.disabled.setVisibility(View.GONE);
-        // Only allow a package to be chosen if it is enabled and installed for all users.
-        convertView.setEnabled(isEnabled(position));
-        if (info.info.packageName.equals(mCurrentWebViewPackageName)) {
-            convertView.setBackgroundColor(Color.GRAY);
-        } else {
-            convertView.setBackgroundColor(Color.WHITE);
-        }
-        return convertView;
-    }
-
-    @Override
-    public boolean isEnabled (int position) {
-        WebViewApplicationInfo info = getItem(position);
-        return info.disabledReason == null;
-    }
-
-    @Override
-    public boolean areAllItemsEnabled() {
-        int numItems = getCount();
-        for (int n = 0; n < numItems; n++) {
-            if (!isEnabled(n)) return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns the reason why a package cannot be used as WebView implementation.
-     * This is either because of it being disabled, uninstalled, or hidden for any user.
-     */
-    @VisibleForTesting
-    static String getDisabledReason(WebViewUpdateServiceWrapper webviewUpdateServiceWrapper,
-            Context context, String packageName) {
-        StringBuilder disabledReason = new StringBuilder();
-        List<UserPackageWrapper> userPackages =
-                webviewUpdateServiceWrapper.getPackageInfosAllUsers(context, packageName);
-        for (UserPackageWrapper userPackage : userPackages) {
-            if (!userPackage.isInstalledPackage()) {
-                // Package uninstalled/hidden
-                disabledReason.append(context.getString(
-                        R.string.webview_uninstalled_for_user, userPackage.getUserInfo().name));
-            } else if (!userPackage.isEnabledPackage()) {
-                // Package disabled
-                disabledReason.append(context.getString(
-                    R.string.webview_disabled_for_user, userPackage.getUserInfo().name));
-            }
-        }
-        if (disabledReason.length() == 0) return null;
-        return disabledReason.toString();
-    }
-}
-
diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java
index 2417b00..aa229ac 100644
--- a/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/src/com/android/settings/webview/WebViewAppPicker.java
@@ -16,57 +16,83 @@
 
 package com.android.settings.webview;
 
-import android.app.ListActivity;
+import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.RemoteException;
 import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.View;
-import android.webkit.WebViewFactory;
-import android.widget.ListView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settings.R;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
 
-public class WebViewAppPicker extends ListActivity implements Instrumentable {
-    private static final String TAG = WebViewAppPicker.class.getSimpleName();
-    private WebViewAppListAdapter mAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WebViewAppPicker extends DefaultAppPickerFragment {
     private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
 
-    private final VisibilityLoggerMixin mVisibilityLoggerMixin =
-            new VisibilityLoggerMixin(getMetricsCategory());
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
+    private WebViewUpdateServiceWrapper getWebViewUpdateServiceWrapper() {
         if (mWebViewUpdateServiceWrapper == null) {
             setWebViewUpdateServiceWrapper(createDefaultWebViewUpdateServiceWrapper());
         }
-        mAdapter = new WebViewAppListAdapter(this, mWebViewUpdateServiceWrapper);
-        setListAdapter(mAdapter);
-
-        mVisibilityLoggerMixin.onAttach(this);
+        return mWebViewUpdateServiceWrapper;
     }
 
     @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        WebViewApplicationInfo app = mAdapter.getItem(position);
+    public void onAttach(Context context) {
+        super.onAttach(context);
 
-        if (mWebViewUpdateServiceWrapper.setWebViewProvider(app.info.packageName)) {
-            Intent intent = new Intent();
-            intent.setAction(app.info.packageName);
-            setResult(RESULT_OK, intent);
-        } else {
-            mWebViewUpdateServiceWrapper.showInvalidChoiceToast(this);
+        if (!mUserManager.isAdminUser()) {
+            getActivity().finish();
         }
-        finish();
     }
 
+    @Override
+    protected List<DefaultAppInfo> getCandidates() {
+        final List<DefaultAppInfo> packageInfoList = new ArrayList<DefaultAppInfo>();
+        List<ApplicationInfo> pkgs =
+                getWebViewUpdateServiceWrapper().getValidWebViewApplicationInfos(getContext());
+        for (ApplicationInfo ai : pkgs) {
+            packageInfoList.add(new DefaultAppInfo(ai,
+                      getDisabledReason(getWebViewUpdateServiceWrapper(),
+                              getContext(), ai.packageName)));
+        }
+        return packageInfoList;
+    }
+
+    @Override
+    protected String getDefaultAppKey() {
+        PackageInfo currentPackage = getWebViewUpdateServiceWrapper().getCurrentWebViewPackage();
+        return currentPackage == null ? null : currentPackage.packageName;
+    }
+
+    protected boolean setDefaultAppKey(String key) {
+        boolean success = getWebViewUpdateServiceWrapper().setWebViewProvider(key);
+        return success;
+    }
+
+    @Override
+    protected void onSelectionPerformed(boolean success) {
+        if (success) {
+            Activity activity = getActivity();
+            Intent intent = activity == null ? null : activity.getIntent();
+            if (intent != null && ACTION_WEBVIEW_SETTINGS.equals(intent.getAction())) {
+                // If this was started through ACTION_WEBVIEW_SETTINGS then return once we have
+                // chosen a new package.
+                getActivity().finish();
+            }
+        } else {
+            getWebViewUpdateServiceWrapper().showInvalidChoiceToast(getActivity());
+            updateCandidates();
+        }
+    }
+
+
     private WebViewUpdateServiceWrapper createDefaultWebViewUpdateServiceWrapper() {
         return new WebViewUpdateServiceWrapper();
     }
@@ -77,19 +103,31 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        mVisibilityLoggerMixin.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mVisibilityLoggerMixin.onPause();
-    }
-
-    @Override
     public int getMetricsCategory() {
         return MetricsEvent.WEBVIEW_IMPLEMENTATION;
     }
+
+    /**
+     * Returns the reason why a package cannot be used as WebView implementation.
+     * This is either because of it being disabled, uninstalled, or hidden for any user.
+     */
+    @VisibleForTesting
+    String getDisabledReason(WebViewUpdateServiceWrapper webviewUpdateServiceWrapper,
+            Context context, String packageName) {
+        StringBuilder disabledReason = new StringBuilder();
+        List<UserPackageWrapper> userPackages =
+                webviewUpdateServiceWrapper.getPackageInfosAllUsers(context, packageName);
+        for (UserPackageWrapper userPackage : userPackages) {
+            if (!userPackage.isInstalledPackage()) {
+                // Package uninstalled/hidden
+                return context.getString(
+                        R.string.webview_uninstalled_for_user, userPackage.getUserInfo().name);
+            } else if (!userPackage.isEnabledPackage()) {
+                // Package disabled
+                return context.getString(
+                    R.string.webview_disabled_for_user, userPackage.getUserInfo().name);
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/com/android/settings/webview/WebViewAppPreferenceController.java b/src/com/android/settings/webview/WebViewAppPreferenceController.java
index cfb358e..3a181fe 100644
--- a/src/com/android/settings/webview/WebViewAppPreferenceController.java
+++ b/src/com/android/settings/webview/WebViewAppPreferenceController.java
@@ -14,18 +14,15 @@
 
 package com.android.settings.webview;
 
-import android.app.Activity;
-import android.content.pm.PackageInfo;
 import android.content.Context;
-import android.content.Intent;
-import android.support.annotation.VisibleForTesting;
+import android.content.pm.PackageInfo;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.DevelopmentSettings;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
 
-public class WebViewAppPreferenceController extends PreferenceController {
+public class WebViewAppPreferenceController extends DefaultAppPreferenceController {
 
     private static final String WEBVIEW_APP_KEY = "select_webview_provider";
 
@@ -45,20 +42,9 @@
     }
 
     @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (getPreferenceKey().equals(preference.getKey())) {
-            return true;
-        }
-        return false;
-    }
-
-    public Intent getActivityIntent() {
-        return new Intent(mContext, WebViewAppPicker.class);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        mPreference.setSummary(getCurrentWebViewPackageLabel(mContext));
+    public DefaultAppInfo getDefaultAppInfo() {
+        PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
+        return new DefaultAppInfo(currentPackage == null ? null : currentPackage.applicationInfo);
     }
 
     @Override
@@ -69,23 +55,6 @@
         }
     }
 
-    /**
-     * Handle the return-value from the WebViewAppPicker Activity.
-     */
-    public void onActivityResult(int resultCode, Intent data) {
-        // Update the preference summary no matter whether we succeeded to change the webview
-        // implementation correctly - we might have changed implementation to one the user did not
-        // choose.
-        updateState(null);
-    }
-
-    private String getCurrentWebViewPackageLabel(Context context) {
-        PackageInfo webViewPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
-        if (webViewPackage == null) return "";
-        return webViewPackage.applicationInfo.loadLabel(context.getPackageManager()).toString();
-    }
-
-
     @Override
     public String getPreferenceKey() {
         return WEBVIEW_APP_KEY;
diff --git a/src/com/android/settings/webview/WebViewApplicationInfo.java b/src/com/android/settings/webview/WebViewApplicationInfo.java
deleted file mode 100644
index 6879c59..0000000
--- a/src/com/android/settings/webview/WebViewApplicationInfo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.webview;
-
-import android.content.pm.ApplicationInfo;
-
-final class WebViewApplicationInfo {
-    final ApplicationInfo info;
-    final String label;
-    final String disabledReason;
-
-    public WebViewApplicationInfo(ApplicationInfo info, String label, String disabledReason) {
-        this.info = info;
-        this.label = label;
-        this.disabledReason = disabledReason;
-    }
-}
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index c6bb7ae..f7c2f6e 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -61,6 +61,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.SummaryLoader;
 
 /**
  * The Settings screen for WifiDisplay configuration and connection management.
@@ -744,4 +745,71 @@
             return true;
         }
     }
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+        private final MediaRouter mRouter;
+        private final MediaRouter.Callback mRouterCallback = new MediaRouter.SimpleCallback() {
+            @Override
+            public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {
+                updateSummary();
+            }
+
+            @Override
+            public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {
+                updateSummary();
+            }
+
+            @Override
+            public void onRouteAdded(MediaRouter router, RouteInfo info) {
+                updateSummary();
+            }
+
+            @Override
+            public void onRouteRemoved(MediaRouter router, RouteInfo info) {
+                updateSummary();
+            }
+
+            @Override
+            public void onRouteChanged(MediaRouter router, RouteInfo info) {
+                updateSummary();
+            }
+        };
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                mRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mRouterCallback);
+                updateSummary();
+            } else {
+                mRouter.removeCallback(mRouterCallback);
+            }
+        }
+
+        private void updateSummary() {
+            String summary = mContext.getString(R.string.disconnected);
+
+            final int routeCount = mRouter.getRouteCount();
+            for (int i = 0; i < routeCount; i++) {
+                final MediaRouter.RouteInfo route = mRouter.getRouteAt(i);
+                if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)
+                        && route.isSelected() && !route.isConnecting()) {
+                    summary = mContext.getString(R.string.wifi_display_status_connected);
+                    break;
+                }
+            }
+            mSummaryLoader.setSummary(this, summary);
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
 }
diff --git a/src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java b/src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java
new file mode 100644
index 0000000..8482b9f
--- /dev/null
+++ b/src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java
@@ -0,0 +1,144 @@
+/*
+ * 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.widget;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.HexDump;
+import com.android.settings.R;
+
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class CarrierDemoPasswordDialogFragment extends InstrumentedDialogFragment {
+
+    private static final String TAG = "CarrierDemoPasswordDF";
+
+    private MessageDigest mMessageDigest;
+
+    public CarrierDemoPasswordDialogFragment() {
+        try {
+            mMessageDigest = MessageDigest.getInstance("SHA-256");
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(TAG, "Unable to verify demo mode password", e);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final AlertDialog dialog = new AlertDialog.Builder(getContext())
+                .setPositiveButton(R.string.retail_demo_reset_next,
+                        new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        final Fragment parentFragment = getParentFragment();
+                        if (parentFragment instanceof Callback
+                                && which == DialogInterface.BUTTON_POSITIVE) {
+                            ((Callback) parentFragment).onPasswordVerified();
+                        }
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .setMessage(R.string.retail_demo_reset_message)
+                .setTitle(R.string.retail_demo_reset_title)
+                .create();
+
+        final Context context = dialog.getContext();
+        final EditText passwordField = new EditText(context);
+        passwordField.setSingleLine();
+        passwordField.setInputType(InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        passwordField.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // no-op
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                verifyPassword(dialog, passwordField.getText().toString());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                // no-op
+            }
+        });
+
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface dialogInterface) {
+                verifyPassword(dialog, passwordField.getText().toString());
+                passwordField.requestFocus();
+                final InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
+                        Context.INPUT_METHOD_SERVICE);
+                imm.showSoftInput(passwordField, InputMethodManager.SHOW_IMPLICIT);
+            }
+        });
+        dialog.setCanceledOnTouchOutside(false);
+
+        final TypedArray a = context.obtainStyledAttributes(
+                new int[] { android.R.attr.dialogPreferredPadding });
+        final int sidePadding = a.getDimensionPixelSize(0, 0);
+        dialog.setView(passwordField, sidePadding, 0, sidePadding, 0);
+        a.recycle();
+
+        return dialog;
+    }
+
+    private void verifyPassword(AlertDialog dialog, String input) {
+        final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        if (mMessageDigest == null || TextUtils.isEmpty(input)) {
+            positiveButton.setEnabled(false);
+            return;
+        }
+        final String passwordHash = getContext().getString(
+                com.android.internal.R.string.config_carrierDemoModePassword);
+        if (passwordHash == null || TextUtils.isEmpty(passwordHash)) {
+            // This device does not support carrier demo mode.
+            return;
+        }
+        final byte[] inputDigest = mMessageDigest.digest(input.getBytes());
+        final String inputHash = HexDump.toHexString(inputDigest, 0, inputDigest.length, false);
+        positiveButton.setEnabled(TextUtils.equals(passwordHash, inputHash));
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CARRIER_DEMO_MODE_PASSWORD;
+    }
+
+    public interface Callback {
+        void onPasswordVerified();
+    }
+}
diff --git a/src/com/android/settings/GearPreference.java b/src/com/android/settings/widget/GearPreference.java
similarity index 82%
rename from src/com/android/settings/GearPreference.java
rename to src/com/android/settings/widget/GearPreference.java
index 0f303d3..7659f0f 100644
--- a/src/com/android/settings/GearPreference.java
+++ b/src/com/android/settings/widget/GearPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -11,16 +11,17 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.widget;
 
 import android.content.Context;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.android.settings.R;
 import com.android.settingslib.RestrictedPreference;
 
 /**
@@ -44,7 +45,13 @@
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
         final View gear = holder.findViewById(R.id.settings_button);
-        gear.setOnClickListener(this);
+        if (mOnGearClickListener != null) {
+            gear.setVisibility(View.VISIBLE);
+            gear.setOnClickListener(this);
+        } else {
+            gear.setVisibility(View.GONE);
+            gear.setOnClickListener(null);
+        }
         gear.setEnabled(true);  // Make gear available even if the preference itself is disabled.
     }
 
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 4650730..94c429b 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -110,6 +110,7 @@
     }
 
     private void init() {
+        setLayoutResource(R.layout.preference_master_switch);
         setWidgetLayoutResource(R.layout.preference_widget_master_switch);
     }
 }
diff --git a/src/com/android/settings/wifi/AllowRecommendationPreferenceController.java b/src/com/android/settings/wifi/AllowRecommendationPreferenceController.java
deleted file mode 100644
index a58055d..0000000
--- a/src/com/android/settings/wifi/AllowRecommendationPreferenceController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-
-import com.android.settings.core.PreferenceController;
-
-public class AllowRecommendationPreferenceController extends PreferenceController {
-
-    private static final String KEY_ALLOW_RECOMMENDATIONS = "allow_recommendations";
-
-    public AllowRecommendationPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        ((SwitchPreference) preference).setChecked(Settings.Global.getInt(
-                mContext.getContentResolver(),
-                Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1);
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (!TextUtils.equals(preference.getKey(), KEY_ALLOW_RECOMMENDATIONS)) {
-            return false;
-        }
-        if (!(preference instanceof SwitchPreference)) {
-            return false;
-        }
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED,
-                ((SwitchPreference) preference).isChecked() ? 1 : 0);
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_ALLOW_RECOMMENDATIONS;
-    }
-}
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index ce671fe..18cc28b 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -25,6 +25,7 @@
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.network.WifiCallingPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
@@ -52,7 +53,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(3);
+        mProgressiveDisclosureMixin.setTileLimit(2);
     }
 
     @Override
@@ -66,11 +67,11 @@
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), mWifiManager));
         controllers.add(new CellularFallbackPreferenceController(context));
-        controllers.add(new AllowRecommendationPreferenceController(context));
         controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
         controllers.add(new WifiWakeupPreferenceController(context, getLifecycle()));
         controllers.add(new WifiSleepPolicyPreferenceController(context));
         controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), mWifiManager));
+        controllers.add(new WifiCallingPreferenceController(context));
         controllers.add(new WpsPreferenceController(
                 context, getLifecycle(), mWifiManager, getFragmentManager()));
         return controllers;
diff --git a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
new file mode 100644
index 0000000..f771a1f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import static com.android.settings.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.R;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+        })
+public class ConfirmCredentialTest {
+    @Test
+    public void testLastTryDialogShownExactlyOnce() {
+        FragmentManager fm = Robolectric.buildActivity(Activity.class).get().getFragmentManager();
+
+        // Launch only one instance at a time.
+        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isTrue();
+        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isFalse();
+
+        // After cancelling, the dialog should be re-shown when asked for.
+        LastTryDialog.hide(fm);
+        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
deleted file mode 100644
index ac499eb..0000000
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.provider.Settings.System;
-import com.android.settings.dashboard.SummaryLoader;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-import static junit.framework.Assert.assertEquals;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DisplaySettingsTest {
-
-  private Activity mActivity;
-  @Mock private SummaryLoader mSummaryLoader;
-  private SummaryLoader.SummaryProvider mSummaryProvider;
-
-  @Before
-  public void setUp() {
-    MockitoAnnotations.initMocks(this);
-    mActivity = Robolectric.buildActivity(Activity.class).get();
-    mSummaryProvider = DisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
-            mActivity, mSummaryLoader);
-  }
-
-  @Test
-  public void testInvalidTimeouts_summaryShouldBeEmpty() {
-    System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, -1);
-    assertEquals(System.getLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 0), -1);
-    mSummaryProvider.setListening(true);
-
-    System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 1234);
-    mSummaryProvider.setListening(true);
-
-    verify(mSummaryLoader, times(2)).setSummary(mSummaryProvider, "");
-  }
-
-  @Test
-  public void testValidTimeouts_summaryShouldNotBeEmpty() {
-    final CharSequence[] values =
-            mActivity.getResources().getTextArray(R.array.screen_timeout_values);
-
-    for (CharSequence value : values) {
-      long timeout = Long.parseLong(value.toString());
-      System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, timeout);
-      assertEquals(System.getLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 0), timeout);
-      mSummaryProvider.setListening(true);
-    }
-
-    verify(mSummaryLoader, never()).setSummary(mSummaryProvider, "");
-  }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index 87be756..e5c4a66 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -192,6 +192,25 @@
 
     @Test
     @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+    public void onResume_oneProfile_shouldSetAccountTitleWithUserName() {
+        final List<UserInfo> infos = new ArrayList<>();
+        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mUserManager.isManagedProfile()).thenReturn(false);
+        when(mUserManager.isLinkedUser()).thenReturn(false);
+        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
+        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
+        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
+            preferenceGroup);
+
+        mController.onResume();
+
+        verify(preferenceGroup).setTitle(
+            mContext.getString(R.string.account_for_section_header, "user 1"));
+
+    }
+
+    @Test
+    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_noPreferenceScreen_shouldNotCrash() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index 128c211..d31c0f6 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -18,11 +18,17 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
 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.search.SearchIndexableRaw;
+import com.android.settings.testutils.shadow.ShadowAccountManager;
+import com.android.settings.testutils.shadow.ShadowContentResolver;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,6 +57,8 @@
     private Context mContext;
     @Mock(answer = RETURNS_DEEP_STUBS)
     private PreferenceScreen mScreen;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private UserManager mUserManager;
 
     private EmergencyInfoPreferenceController mController;
 
@@ -112,6 +120,21 @@
     }
 
     @Test
+    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+    public void updateState_shouldSetSummary() {
+        final List<UserInfo> infos = new ArrayList<>();
+        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
+        when((Object) mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
+        final Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setSummary(
+            mContext.getString(R.string.emergency_info_summary, "user 1"));
+    }
+
+    @Test
     public void handlePreferenceTreeClick_shouldStartActivity() {
         final ShadowApplication application = ShadowApplication.getInstance();
         final Context context = application.getApplicationContext();
diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
index 90761a0..e1c2abf 100644
--- a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
@@ -15,11 +15,16 @@
  */
 package com.android.settings.accounts;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.UserInfo;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 
+import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.Tile;
@@ -37,6 +42,9 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
@@ -48,6 +56,8 @@
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
+    @Mock
+    private UserManager mUserManager;
     private UserAndAccountDashboardFragment mFragment;
 
     @Before
@@ -87,6 +97,24 @@
     }
 
     @Test
+    public void updateSummary_shouldDisplaySignedInUser() {
+        final Activity activity = mock(Activity.class);
+        final SummaryLoader loader = mock(SummaryLoader.class);
+        final UserInfo userInfo = new UserInfo();
+        userInfo.name = "test_name";
+
+        when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
+
+        final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
+                .createSummaryProvider(activity, loader);
+        provider.setListening(true);
+
+        verify(activity).getString(R.string.user_summary,
+                userInfo.name);
+    }
+
+    @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
                 UserAndAccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
index 229ba45..1625e1c 100644
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 
+import android.annotation.IdRes;
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
@@ -24,15 +25,19 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.applications.InstantDataBuilder.Param;
+import com.android.settings.applications.instantapps.InstantAppDetails;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
@@ -51,6 +56,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.EnumSet;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AppHeaderControllerTest {
@@ -243,4 +250,103 @@
         assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
                 .isEqualTo(View.GONE);
     }
+
+    // Ensure that no instant app related information shows up when the AppHeaderController's
+    // InstantAppDetails are null.
+    @Test
+    public void instantApps_nullInstantAppDetails() {
+        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
+        mController = new AppHeaderController(mContext, mFragment, appHeader);
+        mController.setInstantAppDetails(null);
+        mController.done();
+        assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    // Ensure that no instant app related information shows up when the AppHeaderController has
+    // a non-null InstantAppDetails, but each member of it is null.
+    @Test
+    public void instantApps_detailsMembersNull() {
+        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
+        mController = new AppHeaderController(mContext, mFragment, appHeader);
+
+        InstantAppDetails details = InstantDataBuilder.build(mContext, EnumSet.noneOf(Param.class));
+        mController.setInstantAppDetails(details);
+        mController.done();
+        assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    // Helper to assert a TextView for a given id is visible and has a certain string value.
+    private void assertVisibleContent(View header, @IdRes int id, String expectedValue) {
+        TextView view = (TextView)header.findViewById(id);
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(view.getText()).isEqualTo(expectedValue);
+    }
+
+    // Helper to assert an ImageView for a given id is visible and has a certain Drawable value.
+    private void assertVisibleContent(View header, @IdRes int id, Drawable expectedValue) {
+        ImageView view = (ImageView)header.findViewById(id);
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(view.getDrawable()).isEqualTo(expectedValue);
+    }
+
+    // Test that expected items are present in the header when we have a complete InstantAppDetails.
+    @Test
+    public void instantApps_expectedHeaderItems() {
+        final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
+        mController = new AppHeaderController(mContext, mFragment, header);
+
+        InstantAppDetails details = InstantDataBuilder.build(mContext);
+        mController.setInstantAppDetails(details);
+        mController.done();
+
+        assertVisibleContent(header, R.id.instant_app_developer_title, details.developerTitle);
+        assertVisibleContent(header, R.id.instant_app_maturity_icon,
+                details.maturityRatingIcon);
+        assertVisibleContent(header, R.id.instant_app_maturity_text,
+                details.maturityRatingString);
+        assertVisibleContent(header, R.id.instant_app_monetization,
+                details.monetizationNotice);
+    }
+
+    // Test having each member of InstantAppDetails be null.
+    @Test
+    public void instantApps_expectedHeaderItemsWithSingleNullMembers() {
+        final EnumSet<Param> allParams = EnumSet.allOf(Param.class);
+        for (Param paramToRemove : allParams) {
+            EnumSet<Param> params = allParams.clone();
+            params.remove(paramToRemove);
+            final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
+            mController = new AppHeaderController(mContext, mFragment, header);
+            InstantAppDetails details = InstantDataBuilder.build(mContext, params);
+            mController.setInstantAppDetails(details);
+            mController.done();
+
+            if (params.contains(Param.DEVELOPER_TITLE)) {
+                assertVisibleContent(header, R.id.instant_app_developer_title,
+                        details.developerTitle);
+            }
+            if (params.contains(Param.MATURITY_RATING_ICON)) {
+                assertVisibleContent(header, R.id.instant_app_maturity_icon,
+                        details.maturityRatingIcon);
+            }
+            if (params.contains(Param.MATURITY_RATING_STRING)) {
+                assertVisibleContent(header, R.id.instant_app_maturity_text,
+                        details.maturityRatingString);
+            }
+            if (params.contains(Param.MONETIZATION_NOTICE)) {
+                assertVisibleContent(header, R.id.instant_app_monetization,
+                        details.monetizationNotice);
+            }
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java b/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java
new file mode 100644
index 0000000..81ebe06
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java
@@ -0,0 +1,118 @@
+/**
+ * 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 android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settings.applications.instantapps.InstantAppDetails;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.EnumSet;
+
+/**
+ * Utility class for generating fake InstantAppDetails data to use in tests.
+ */
+public class InstantDataBuilder {
+    public enum Param {
+        MATURITY_RATING_ICON,
+        MATURITY_RATING_STRING,
+        MONETIZATION_NOTICE,
+        DEVELOPER_TITLE,
+        PRIVACY_POLICY,
+        DEVELOPER_WEBSITE,
+        DEVELOPER_EMAIL,
+        DEVELOPER_MAILING_ADDRESS
+    }
+
+    /**
+     * Creates an InstantAppDetails with any desired combination of null/non-null members.
+     *
+     * @param context An optional context, required only if MATURITY_RATING_ICON is a member of
+     * params
+     * @param params Specifies which elements of the returned InstantAppDetails should be non-null
+     * @return InstantAppDetails
+     */
+    public static InstantAppDetails build(@Nullable Context context, EnumSet<Param> params) {
+        Drawable ratingIcon = null;
+        String rating = null;
+        String monetizationNotice = null;
+        String developerTitle = null;
+        URL privacyPolicy = null;
+        URL developerWebsite = null;
+        String developerEmail = null;
+        String developerMailingAddress = null;
+
+        if (params.contains(Param.MATURITY_RATING_ICON)) {
+            ratingIcon = context.getDrawable(R.drawable.ic_android);
+        }
+        if (params.contains(Param.MATURITY_RATING_STRING)) {
+            rating = "everyone";
+        }
+        if (params.contains(Param.MONETIZATION_NOTICE)) {
+            monetizationNotice = "Uses in-app purchases";
+        }
+        if (params.contains(Param.DEVELOPER_TITLE)) {
+            developerTitle = "Instant Apps Inc.";
+        }
+        if (params.contains(Param.DEVELOPER_EMAIL)) {
+            developerEmail = "developer@instant-apps.com";
+        }
+        if (params.contains(Param.DEVELOPER_MAILING_ADDRESS)) {
+            developerMailingAddress = "1 Main Street, Somewhere, CA, 94043";
+        }
+
+        if (params.contains(Param.PRIVACY_POLICY)) {
+            try {
+                privacyPolicy = new URL("https://test.com/privacy");
+            } catch (MalformedURLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if (params.contains(Param.DEVELOPER_WEBSITE)) {
+            try {
+                developerWebsite = new URL("https://test.com");
+            } catch (MalformedURLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return InstantAppDetails.builder()
+                .maturityRatingIcon(ratingIcon)
+                .maturityRatingString(rating)
+                .monetizationNotice(monetizationNotice)
+                .developerTitle(developerTitle)
+                .privacyPolicy(privacyPolicy)
+                .developerWebsite(developerWebsite)
+                .developerEmail(developerEmail)
+                .developerMailingAddress(developerMailingAddress)
+                .build();
+    }
+
+    /**
+     * Convenience method to create an InstantAppDetails with all non-null members.
+     *
+     * @param context a required Context for loading a test maturity rating icon
+     * @return InstantAppDetails
+     */
+    public static InstantAppDetails build(Context context) {
+        return build(context, EnumSet.allOf(Param.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
index 4f560c9..6c44bd5 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -106,6 +106,18 @@
         mFragment.onRadioButtonClicked(pref);
     }
 
+    @Test
+    public void displaySingleOption_shouldSelectRadioButton() {
+        final RadioButtonPreference pref =
+                new RadioButtonPreference(RuntimeEnvironment.application);
+        when(mScreen.getPreferenceCount()).thenReturn(1);
+        when(mScreen.getPreference(0)).thenReturn(pref);
+
+        mFragment.mayCheckOnlyRadioButton();
+
+        assertThat(pref.isChecked()).isTrue();
+    }
+
     public static class TestFragment extends DefaultAppPickerFragment {
 
         boolean setDefaultAppKeyCalled;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index f8d4d12..550addb 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -32,9 +32,7 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -77,7 +75,7 @@
 
         mController.updateState(mPreference);
 
-        verify(mPreference, never()).setSummary(any(CharSequence.class));
+        verify(mPreference).setSummary(null);
     }
 
     private static class TestPreferenceController extends DefaultAppPreferenceController {
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutoFillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutoFillPickerTest.java
new file mode 100644
index 0000000..f2cf729
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutoFillPickerTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.defaultapps;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.PackageManagerWrapper;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DefaultAutoFillPickerTest {
+
+    private static final String TEST_APP_KEY = "123";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    private DefaultAutoFillPicker mPicker;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mPicker = spy(new DefaultAutoFillPicker());
+        mPicker.onAttach((Context) mActivity);
+
+        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
+
+        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
+    }
+
+    @Test
+    public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {
+        assertThat(mPicker.setDefaultAppKey(TEST_APP_KEY)).isTrue();
+        assertThat(mPicker.getDefaultAppKey()).isEqualTo(TEST_APP_KEY);
+    }
+
+    @Test
+    public void getConfirmationMessage_shouldNotBeNull() {
+        final DefaultAppInfo info = mock(DefaultAppInfo.class);
+        when(info.loadLabel(any(PackageManager.class))).thenReturn("test_app_name");
+        assertThat(mPicker.getConfirmationMessage(info)).isNotNull();
+    }
+
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceControllerTest.java
new file mode 100644
index 0000000..1c37368
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.defaultapps;
+
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.PackageManagerWrapper;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DefaultAutoFillPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private UserManager mUserManager;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PackageManagerWrapper mPackageManager;
+
+    private DefaultAutoFillPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+
+        mController = spy(new DefaultAutoFillPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_hasNoApp_shouldNotReturnLabel() {
+        final Preference pref = mock(Preference.class);
+
+        mController.updateState(pref);
+        verify(pref).setSummary(null);
+    }
+
+    @Test
+    public void getDefaultAppInfo_shouldHaveSettingsProvider() {
+        ReflectionHelpers.setField(mController, "mContext", RuntimeEnvironment.application);
+        Settings.Secure.putString(RuntimeEnvironment.application.getContentResolver(),
+                DefaultAutoFillPicker.SETTING, "com.android.settings/SettingsActivity.class");
+
+        final DefaultAppInfo info = mController.getDefaultAppInfo();
+
+        assertThat(info).isNotNull();
+
+        mController.getSettingIntent(info);
+
+        verify(mPackageManager.getPackageManager()).queryIntentServices(
+                DefaultAutoFillPicker.AUTO_FILL_PROBE, PackageManager.GET_META_DATA);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
index e7b11d9..b0231f8 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
@@ -20,7 +20,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
-import android.provider.Settings;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -32,11 +31,9 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index e06dfee..2f5602f 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -39,7 +39,6 @@
 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;
 
@@ -77,7 +76,7 @@
         final Preference pref = mock(Preference.class);
 
         mController.updateState(pref);
-        verify(pref, never()).setSummary(any(String.class));
+        verify(pref).setSummary(null);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
index 72d6609..1b87e6c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
@@ -20,6 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -27,7 +28,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SerialNumberPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
new file mode 100644
index 0000000..84d3b98
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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 android.app.Activity;
+import android.icu.text.NumberFormat;
+import android.os.storage.VolumeInfo;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class StorageSettingsTest {
+
+    @Mock
+    private StorageManagerVolumeProvider mStorageManagerVolumeProvider;
+    @Mock
+    private Activity mActivity;
+
+    private List<VolumeInfo> mVolumes;
+
+    private StorageSettings mSettings;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mVolumes = new ArrayList<>();
+        mVolumes.add(mock(VolumeInfo.class, RETURNS_DEEP_STUBS));
+        mSettings = new StorageSettings();
+        when(mStorageManagerVolumeProvider.getVolumes()).thenReturn(mVolumes);
+    }
+
+    @Test
+    public void updateSummary_shouldDisplayUsedPercentAndFreeSpace() {
+        final SummaryLoader loader = mock(SummaryLoader.class);
+        final SummaryLoader.SummaryProvider provider =
+                StorageSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
+        final VolumeInfo volumeInfo = mVolumes.get(0);
+        when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
+        when(volumeInfo.getPath().getTotalSpace()).thenReturn(500L);
+        when(volumeInfo.getPath().getFreeSpace()).thenReturn(0L);
+
+        ReflectionHelpers.setField(
+                provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
+        ReflectionHelpers.setField(provider, "mContext", RuntimeEnvironment.application);
+
+        provider.setListening(true);
+
+        final String percentage = NumberFormat.getPercentInstance().format(1);
+        final String freeSpace = Formatter.formatFileSize(RuntimeEnvironment.application, 0);
+        verify(loader).setSummary(provider,
+                RuntimeEnvironment.application.getString(
+                        R.string.storage_summary, percentage, freeSpace));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
new file mode 100644
index 0000000..99c37ef
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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 android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.usb.UsbManager;
+
+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 static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UsbBackendTest {
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private UsbManager mUsbManager;
+    @Mock
+    private UsbBackend.UserRestrictionUtil mUserRestrictionUtil;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI))
+            .thenReturn(true);
+        when((Object)mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
+    }
+
+    @Test
+    public void constructor_noUsbPort_shouldNotCrash() {
+        UsbBackend usbBackend = new UsbBackend(mContext, mUserRestrictionUtil);
+        // Should not crash
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index cfec382..4851b5e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -25,7 +25,6 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Environment;
 import android.os.UserHandle;
 import android.os.storage.VolumeInfo;
 import android.provider.DocumentsContract;
@@ -41,7 +40,6 @@
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ManageApplications;
-import com.android.settingslib.deviceinfo.StorageMeasurement;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
@@ -55,8 +53,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.HashMap;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class StorageItemPreferenceControllerTest {
@@ -82,7 +78,7 @@
         mContext = RuntimeEnvironment.application;
         // Note: null is passed as the Lifecycle because we are handling it outside of the normal
         //       Settings fragment lifecycle for test purposes.
-        mController = new StorageItemPreferenceController(mContext, null, mFragment, mVolume, mSvp);
+        mController = new StorageItemPreferenceController(mContext, mFragment, mVolume, mSvp);
         mPreference = new StorageItemPreferenceAlternate(mContext);
 
         // Inflate the preference and the widget.
@@ -205,23 +201,23 @@
                 Mockito.eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
         mController.displayPreference(screen);
 
-        StorageMeasurement.MeasurementDetails details = new StorageMeasurement.MeasurementDetails();
-        details.appsSize.put(0, KILOBYTE);
-        HashMap<String, Long> mediaSizes = new HashMap<>();
-        mediaSizes.put(Environment.DIRECTORY_PICTURES, KILOBYTE * 2);
-        mediaSizes.put(Environment.DIRECTORY_MOVIES, KILOBYTE * 3);
-        mediaSizes.put(Environment.DIRECTORY_MUSIC, KILOBYTE * 4);
-        mediaSizes.put(Environment.DIRECTORY_DOWNLOADS, KILOBYTE * 5);
-        details.mediaSize.put(0, mediaSizes);
         mController.setSystemSize(KILOBYTE * 6);
-        mController.onDetailsChanged(details);
-        AppsAsyncLoader.AppsStorageResult result = new AppsAsyncLoader.AppsStorageResult();
+        StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
+        result.gamesSize = KILOBYTE * 8;
+        result.musicAppsSize = KILOBYTE * 4;
+        result.otherAppsSize = KILOBYTE * 9;
+        result.externalStats = new StorageStatsSource.ExternalStorageStats(
+                KILOBYTE * 50, // total
+                KILOBYTE * 10, // audio
+                KILOBYTE * 15, // video
+                KILOBYTE * 20); // image
+
         result.gamesSize = KILOBYTE * 8;
         result.otherAppsSize = KILOBYTE * 9;
         mController.onLoadFinished(null, result);
 
-        assertThat(audio.getSummary().toString()).isEqualTo("4.00KB");
-        assertThat(image.getSummary().toString()).isEqualTo("5.00KB");
+        assertThat(audio.getSummary().toString()).isEqualTo("14.00KB"); // 4KB apps + 10KB files
+        assertThat(image.getSummary().toString()).isEqualTo("35.00KB"); // 15KB video + 20KB images
         assertThat(games.getSummary().toString()).isEqualTo("8.00KB");
         assertThat(apps.getSummary().toString()).isEqualTo("9.00KB");
         assertThat(system.getSummary().toString()).isEqualTo("6.00KB");
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
index 990223a..2489bac 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -69,7 +69,7 @@
         mController.updateBytes(0, 0);
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B used");
+        assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B");
         assertThat(mPreference.getSummary().toString()).isEqualTo("0.00B free");
     }
 
@@ -78,7 +78,7 @@
         mController.updateBytes(1024, 1024 * 10);
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB used");
+        assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB");
         assertThat(mPreference.getSummary().toString()).isEqualTo("9.00KB free");
     }
 
@@ -95,7 +95,7 @@
         mController.updateSizes(svp, volume);
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB used");
+        assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB");
         assertThat(mPreference.getSummary().toString()).isEqualTo("1.00KB free");
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
new file mode 100644
index 0000000..17cd223
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -0,0 +1,137 @@
+package com.android.settings.fuelgauge;
+
+import android.os.Process;
+import android.util.SparseArray;
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatterySipper.DrainType;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData;
+import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
+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.ArrayList;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PowerUsageAdvancedTest {
+    private static final int FAKE_UID_1 = 50;
+    private static final int FAKE_UID_2 = 100;
+    private static final double TYPE_APP_USAGE = 80;
+    private static final double TYPE_BLUETOOTH_USAGE = 50;
+    private static final double TYPE_WIFI_USAGE = 0;
+    private static final double TOTAL_USAGE = TYPE_APP_USAGE * 2 + TYPE_BLUETOOTH_USAGE
+            + TYPE_WIFI_USAGE;
+    private static final double PRECISION = 0.001;
+    private static final String STRING_NOT_FOUND = "not_found";
+    @Mock
+    private BatterySipper mBatterySipper;
+    @Mock
+    private BatteryStatsHelper mBatteryStatsHelper;
+    private PowerUsageAdvanced mPowerUsageAdvanced;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPowerUsageAdvanced = new PowerUsageAdvanced();
+
+        List<BatterySipper> batterySippers = new ArrayList<>();
+        batterySippers.add(new BatterySipper(DrainType.APP,
+                new FakeUid(FAKE_UID_1), TYPE_APP_USAGE));
+        batterySippers.add(new BatterySipper(DrainType.APP,
+                new FakeUid(FAKE_UID_2), TYPE_APP_USAGE));
+        batterySippers.add(new BatterySipper(DrainType.BLUETOOTH, new FakeUid(FAKE_UID_1),
+                TYPE_BLUETOOTH_USAGE));
+        batterySippers.add(new BatterySipper(DrainType.WIFI, new FakeUid(FAKE_UID_1),
+                TYPE_WIFI_USAGE));
+
+        when(mBatteryStatsHelper.getUsageList()).thenReturn(batterySippers);
+        when(mBatteryStatsHelper.getTotalPower()).thenReturn(TOTAL_USAGE);
+    }
+
+    @Test
+    public void testExtractUsageType_TypeSystem_ReturnSystem() {
+        mBatterySipper.drainType = DrainType.APP;
+        final int uids[] = {Process.SYSTEM_UID, Process.ROOT_UID};
+
+        for (int uid : uids) {
+            when(mBatterySipper.getUid()).thenReturn(uid);
+            assertThat(mPowerUsageAdvanced.extractUsageType(mBatterySipper))
+                    .isEqualTo(UsageType.SYSTEM);
+        }
+    }
+
+    @Test
+    public void testExtractUsageType_TypeEqualsToDrainType_ReturnRelevantType() {
+        final DrainType drainTypes[] = {DrainType.WIFI, DrainType.BLUETOOTH, DrainType.IDLE,
+                DrainType.USER, DrainType.CELL};
+        final int usageTypes[] = {UsageType.WIFI, UsageType.BLUETOOTH, UsageType.IDLE,
+                UsageType.USER, UsageType.CELL};
+
+        assertThat(drainTypes.length).isEqualTo(usageTypes.length);
+        for (int i = 0, size = drainTypes.length; i < size; i++) {
+            mBatterySipper.drainType = drainTypes[i];
+            assertThat(mPowerUsageAdvanced.extractUsageType(mBatterySipper))
+                    .isEqualTo(usageTypes[i]);
+        }
+    }
+
+    @Test
+    public void testParsePowerUsageData_PercentageCalculatedCorrectly() {
+        final double percentApp = TYPE_APP_USAGE * 2 / TOTAL_USAGE * 100;
+        final double percentWifi = TYPE_WIFI_USAGE / TOTAL_USAGE * 100;
+        final double percentBluetooth = TYPE_BLUETOOTH_USAGE / TOTAL_USAGE * 100;
+
+        mPowerUsageAdvanced.init();
+        List<PowerUsageData> batteryData =
+                mPowerUsageAdvanced.parsePowerUsageData(mBatteryStatsHelper);
+        for (PowerUsageData data : batteryData) {
+            switch (data.usageType) {
+                case UsageType.WIFI:
+                    assertThat(data.percentage).isWithin(PRECISION).of(percentWifi);
+                    break;
+                case UsageType.APP:
+                    assertThat(data.percentage).isWithin(PRECISION).of(percentApp);
+                    break;
+                case UsageType.BLUETOOTH:
+                    assertThat(data.percentage).isWithin(PRECISION).of(percentBluetooth);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    @Test
+    public void testInit_ContainsAllUsageType() {
+        mPowerUsageAdvanced.init();
+        final SparseArray<String> array = mPowerUsageAdvanced.mUsageTypeMap;
+
+        assertThat(array.get(UsageType.APP, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.WIFI, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.CELL, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.BLUETOOTH, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.IDLE, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.SERVICE, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.USER, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+        assertThat(array.get(UsageType.SYSTEM, STRING_NOT_FOUND))
+                .isNotEqualTo(STRING_NOT_FOUND);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 63cb5e1..60e1f50 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -44,7 +44,6 @@
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -61,6 +60,7 @@
     private static final int UID = 123;
     private static final int POWER_MAH = 100;
     private static final double BATTERY_SCREEN_USAGE = 300;
+    private static final double BATTERY_SYSTEM_USAGE = 600;
     private static final double PRECISION = 0.001;
     private static final Intent ADDITIONAL_BATTERY_INFO_INTENT =
             new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
@@ -80,6 +80,8 @@
     @Mock
     private BatterySipper mScreenBatterySipper;
     @Mock
+    private BatterySipper mSystemBatterySipper;
+    @Mock
     private PowerGaugePreference mPreference;
 
     private TestFragment mFragment;
@@ -114,6 +116,9 @@
 
         mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
         mScreenBatterySipper.totalPowerMah = BATTERY_SCREEN_USAGE;
+        mSystemBatterySipper.drainType = BatterySipper.DrainType.APP;
+        mSystemBatterySipper.totalPowerMah = BATTERY_SYSTEM_USAGE;
+        when(mSystemBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
     }
 
     @Test
@@ -162,17 +167,6 @@
     }
 
     @Test
-    public void testRemoveScreenBatterySipper_ContainsScreenSipper_RemoveAndReturnValue() {
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(mNormalBatterySipper);
-        sippers.add(mScreenBatterySipper);
-
-        final double screenUsage = mPowerUsageSummary.removeScreenBatterySipper(sippers);
-        assertThat(sippers).containsExactly(mNormalBatterySipper);
-        assertThat(screenUsage).isWithin(PRECISION).of(BATTERY_SCREEN_USAGE);
-    }
-
-    @Test
     public void testExtractKeyFromSipper_TypeAPPUidObjectNotNull_ReturnUid() {
         mNormalBatterySipper.uidObj = new BatteryStatsImpl.Uid(new BatteryStatsImpl(), UID);
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
@@ -182,6 +176,18 @@
     }
 
     @Test
+    public void testRemoveHiddenBatterySippers_ContainsHiddenSippers_RemoveAndReturnValue() {
+        final List<BatterySipper> sippers = new ArrayList<>();
+        sippers.add(mNormalBatterySipper);
+        sippers.add(mScreenBatterySipper);
+        sippers.add(mSystemBatterySipper);
+
+        final double totalUsage = mPowerUsageSummary.removeHiddenBatterySippers(sippers);
+        assertThat(sippers).containsExactly(mNormalBatterySipper);
+        assertThat(totalUsage).isWithin(PRECISION).of(BATTERY_SCREEN_USAGE + BATTERY_SYSTEM_USAGE);
+    }
+
+    @Test
     public void testShouldHideSipper_TypeIdle_ReturnTrue() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.IDLE;
         assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
@@ -194,6 +200,12 @@
     }
 
     @Test
+    public void testShouldHideSipper_TypeScreen_ReturnTrue() {
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
+        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    }
+
+    @Test
     public void testShouldHideSipper_UidRoot_ReturnTrue() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
         when(mNormalBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index dc96ed6..7626ec4 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -17,13 +17,13 @@
 
 import android.content.Context;
 import android.provider.SearchIndexableResource;
+import android.view.Menu;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.dashboard.DashboardFragmentRegistry;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.drawer.CategoryKey;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,10 +32,14 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -72,4 +76,16 @@
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
     }
+
+    @Test
+    public void testPrepareActionBar_networkResetShouldBeCreated() {
+        final NetworkResetActionMenuController resetController =
+                mock(NetworkResetActionMenuController.class);
+        ReflectionHelpers.setField(mFragment, "mNetworkResetController", resetController);
+
+        mFragment.onCreateOptionsMenu(null, null);
+
+        verify(resetController).buildMenuItem(any(Menu.class));
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
new file mode 100644
index 0000000..ba332b7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.view.Menu;
+import android.view.MenuItem;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class NetworkResetActionMenuControllerTest {
+
+    private Context mContext;
+    private NetworkResetActionMenuController mController;
+    @Mock
+    private Menu mMenu;
+    @Mock
+    private MenuItem mMenuItem;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new NetworkResetActionMenuController(mContext));
+        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
+    }
+
+    @Test
+    public void buildMenuItem_available_shouldAddToMenu() {
+        doReturn(true).when(mController).isAvailable();
+
+        mController.buildMenuItem(mMenu);
+
+        verify(mMenu).add(anyInt(), anyInt(), anyInt(), anyInt());
+        verify(mMenuItem).setOnMenuItemClickListener(any(MenuItem.OnMenuItemClickListener.class));
+    }
+
+    @Test
+    public void buildMenuItem_notAvailable_shouldNotAddToMenu() {
+        doReturn(false).when(mController).isAvailable();
+
+        mController.buildMenuItem(mMenu);
+
+        verify(mMenu, never()).add(anyInt(), anyInt(), anyInt(), anyInt());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/qstile/DevelopmentModeTileTest.java b/tests/robotests/src/com/android/settings/qstile/DevelopmentModeTileTest.java
deleted file mode 100644
index a30bd47..0000000
--- a/tests/robotests/src/com/android/settings/qstile/DevelopmentModeTileTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.android.settings.qstile;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Intent;
-import android.service.quicksettings.Tile;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowTileService;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.ShadowExtractor;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowTileService.class)
-public class DevelopmentModeTileTest {
-
-    @Mock private Tile mTile;
-    @Mock private DevelopmentModeTile.DevModeProperties mProps;
-
-    private DevelopmentModeTile mDevelopmentModeTile;
-    private ShadowTileService mShadowTileService;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mDevelopmentModeTile = Robolectric.buildService(DevelopmentModeTile.class).get();
-
-        ReflectionHelpers.setField(mDevelopmentModeTile, "mProps", mProps);
-        mShadowTileService = (ShadowTileService) ShadowExtractor.extract(mDevelopmentModeTile);
-        mShadowTileService.setTile(mTile);
-    }
-
-    @Test
-    public void refresh() {
-        verifyRefreshState(false, true, Tile.STATE_UNAVAILABLE);
-        verifyRefreshState(false, false, Tile.STATE_UNAVAILABLE);
-        verifyRefreshState(true, false, Tile.STATE_INACTIVE);
-        verifyRefreshState(true, true, Tile.STATE_ACTIVE);
-    }
-
-    @Test
-    public void onClick_startSetting() {
-        when(mTile.getState()).thenReturn(Tile.STATE_UNAVAILABLE);
-        mDevelopmentModeTile.onClick();
-
-        Intent intent = mShadowTileService.getNextStartedActivity();
-        assertEquals(DevelopmentTileConfigActivity.class.getName(),
-                intent.getComponent().getClassName());
-    }
-
-    private void verifyRefreshState(boolean isSet, boolean allMatch, int expectedState) {
-        reset(mProps, mTile);
-
-        mProps.isSet = isSet;
-        mProps.allMatch = allMatch;
-        mDevelopmentModeTile.refresh();
-
-        verify(mProps).refreshState(eq(mDevelopmentModeTile));
-        verify(mTile).setState(eq(expectedState));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
deleted file mode 100644
index 65a8805..0000000
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.system;
-
-
-import android.app.Activity;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.google.common.truth.Truth;
-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.android.settings.system.SystemDashboardFragment.SUMMARY_PROVIDER_FACTORY;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SystemDashboardFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-    }
-
-    @Test
-    public void hasSummaryProvider() {
-        Truth.assertThat(SUMMARY_PROVIDER_FACTORY).isNotNull();
-    }
-
-    @Test
-    public void updateSummary_isListening_shouldNotifySummaryLoader() {
-        final SummaryLoader.SummaryProvider summaryProvider =
-                SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
-        summaryProvider.setListening(true);
-
-        verify(mSummaryLoader).setSummary(eq(summaryProvider), anyString());
-    }
-
-    @Test
-    public void updateSummary_notListening_shouldNotNotifySummaryLoader() {
-        final SummaryLoader.SummaryProvider summaryProvider =
-                SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
-        summaryProvider.setListening(false);
-
-        verify(mSummaryLoader, never()).setSummary(eq(summaryProvider), anyString());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppListAdapterTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppListAdapterTest.java
deleted file mode 100644
index a8ab5d4..0000000
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppListAdapterTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.webview;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.UserInfo;
-
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import java.util.Arrays;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WebViewAppListAdapterTest {
-    private Context mContext = RuntimeEnvironment.application;
-
-    private final static UserInfo FIRST_USER = new UserInfo(0, "FIRST_USER", 0);
-    private final static UserInfo SECOND_USER = new UserInfo(0, "SECOND_USER", 0);
-
-    private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
-
-    @Test
-    public void testDisabledReasonNullIfPackagesOk() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-
-        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
-        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
-        when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(
-                any(), eq(DEFAULT_PACKAGE_NAME))).thenReturn(
-                        Arrays.asList(packageForFirstUser, packageForSecondUser));
-
-        assertThat(WebViewAppListAdapter.getDisabledReason(
-                wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isNull();
-    }
-
-    @Test
-    public void testDisabledReasonForSingleUserDisabledPackage() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
-                )).thenReturn(Arrays.asList(packageForFirstUser));
-
-        assertThat(WebViewAppListAdapter.getDisabledReason(wvusWrapper, mContext,
-                DEFAULT_PACKAGE_NAME)).isEqualTo("Disabled for user " + FIRST_USER.name + "\n");
-    }
-
-    @Test
-    public void testDisabledReasonForSingleUserUninstalledPackage() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
-                )).thenReturn(Arrays.asList(packageForFirstUser));
-
-        assertThat(WebViewAppListAdapter.getDisabledReason(wvusWrapper, mContext,
-                DEFAULT_PACKAGE_NAME)).isEqualTo("Uninstalled for user " + FIRST_USER.name + "\n");
-    }
-
-    @Test
-    public void testDisabledReasonSeveralUsers() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
-        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
-        when(packageForSecondUser.isInstalledPackage()).thenReturn(false);
-        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
-                )).thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
-
-        final String EXPECTED_DISABLED_REASON = String.format(
-                "Disabled for user %s\nUninstalled for user %s\n",
-                FIRST_USER.name, SECOND_USER.name);
-        assertThat(WebViewAppListAdapter.getDisabledReason(
-                wvusWrapper, mContext,DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
-    }
-
-    /**
-     * Ensure we only proclaim a package as uninstalled for a certain user if it's both uninstalled
-     * and disabled.
-     */
-    @Test
-    public void testDisabledReasonUninstalledAndDisabled() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
-        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
-        when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
-        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
-                )).thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
-
-        final String EXPECTED_DISABLED_REASON = String.format(
-                "Uninstalled for user %s\n", FIRST_USER.name);
-        assertThat(WebViewAppListAdapter.getDisabledReason(wvusWrapper, mContext,
-                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 8ace8aa..78839fa 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -16,94 +16,252 @@
 
 package com.android.settings.webview;
 
+import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.shadows.ShadowView.clickOn;
-import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
-import android.view.View;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.applications.PackageManagerWrapper;
 
 import java.util.Arrays;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
+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.ActivityController;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WebViewAppPickerTest {
+    private Context mContext = RuntimeEnvironment.application;
 
-  private static final String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
+    private final static UserInfo FIRST_USER = new UserInfo(0, "FIRST_USER", 0);
+    private final static UserInfo SECOND_USER = new UserInfo(0, "SECOND_USER", 0);
 
-  private static ApplicationInfo createApplicationInfo(String packageName) {
-      ApplicationInfo ai = new ApplicationInfo();
-      ai.packageName = packageName;
-      return ai;
-  }
+    private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
 
-  @Test
-  public void testClickingItemChangesProvider() {
-      ActivityController<WebViewAppPicker> controller =
-              Robolectric.buildActivity(WebViewAppPicker.class);
-      WebViewAppPicker webviewAppPicker = controller.get();
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
 
-      WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-      when(wvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
-              Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
-      when(wvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(true);
+    private WebViewAppPicker mPicker;
+    private WebViewUpdateServiceWrapper mWvusWrapper;
 
-      webviewAppPicker.setWebViewUpdateServiceWrapper(wvusWrapper);
+    private static ApplicationInfo createApplicationInfo(String packageName) {
+        ApplicationInfo ai = new ApplicationInfo();
+        ai.packageName = packageName;
+        return ai;
+    }
 
-      controller.create().start().postCreate(null).resume().visible();
-      WebViewApplicationInfo firstItem =
-              (WebViewApplicationInfo) webviewAppPicker.getListView().getItemAtPosition(0);
-      assertThat(firstItem.info.packageName).isEqualTo(DEFAULT_PACKAGE_NAME);
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
 
-      webviewAppPicker.onListItemClick(webviewAppPicker.getListView(), null, 0, 0);
+        mPicker = new WebViewAppPicker();
+        mPicker = spy(mPicker);
+        doNothing().when(mPicker).updateCandidates();
+        doNothing().when(mPicker).updateCheckedState(any());
+        doReturn(mActivity).when(mPicker).getActivity();
 
-      verify(wvusWrapper, times(1)).setWebViewProvider(eq(DEFAULT_PACKAGE_NAME));
-      assertThat(shadowOf(webviewAppPicker).getResultCode()).isEqualTo(Activity.RESULT_OK);
-      verify(wvusWrapper, never()).showInvalidChoiceToast(any());
-  }
+        mWvusWrapper = mock(WebViewUpdateServiceWrapper.class);
+        mPicker.setWebViewUpdateServiceWrapper(mWvusWrapper);
+    }
 
-  @Test
-  public void testFailingPackageChangeReturnsCancelled() {
-      ActivityController<WebViewAppPicker> controller =
-              Robolectric.buildActivity(WebViewAppPicker.class);
-      WebViewAppPicker webviewAppPicker = controller.get();
+    @Test
+    public void testClickingItemChangesProvider() {
+        testSuccessfulClickChangesProvider();
+    }
 
-      WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-      when(wvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
-              Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
-      when(wvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(false);
+    @Test
+    public void testFailingClick() {
+        testFailingClickUpdatesSetting();
+    }
 
-      webviewAppPicker.setWebViewUpdateServiceWrapper(wvusWrapper);
+    @Test
+    public void testClickingItemInActivityModeChangesProviderAndFinishes() {
+        useWebViewSettingIntent();
+        testSuccessfulClickChangesProvider();
+        verify(mActivity, times(1)).finish();
+    }
 
-      controller.create().start().postCreate(null).resume().visible();
-      WebViewApplicationInfo firstItem =
-              (WebViewApplicationInfo) webviewAppPicker.getListView().getItemAtPosition(0);
-      assertThat(firstItem.info.packageName).isEqualTo(DEFAULT_PACKAGE_NAME);
+    @Test
+    public void testFailingClickInActivityMode() {
+        useWebViewSettingIntent();
+        testFailingClick();
+    }
 
-      webviewAppPicker.onListItemClick(webviewAppPicker.getListView(), null, 0, 0);
+    private void useWebViewSettingIntent() {
+        Intent intent = new Intent(ACTION_WEBVIEW_SETTINGS);
+        when(mActivity.getIntent()).thenReturn(intent);
+    }
 
-      verify(wvusWrapper, times(1)).setWebViewProvider(eq(DEFAULT_PACKAGE_NAME));
-      assertThat(shadowOf(webviewAppPicker).getResultCode()).isEqualTo(Activity.RESULT_CANCELED);
-      verify(wvusWrapper, times(1)).showInvalidChoiceToast(any());
-  }
+    private void testSuccessfulClickChangesProvider() {
+        when(mWvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
+                Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
+        when(mWvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(true);
+
+        RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class);
+        when(defaultPackagePref.getKey()).thenReturn(DEFAULT_PACKAGE_NAME);
+        mPicker.onRadioButtonClicked(defaultPackagePref);
+
+        verify(mWvusWrapper, times(1)).setWebViewProvider(eq(DEFAULT_PACKAGE_NAME));
+        verify(mPicker, times(1)).updateCheckedState(DEFAULT_PACKAGE_NAME);
+        verify(mWvusWrapper, never()).showInvalidChoiceToast(any());
+    }
+
+    private void testFailingClickUpdatesSetting() {
+        when(mWvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
+                Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
+        when(mWvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(false);
+
+        RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class);
+        when(defaultPackagePref.getKey()).thenReturn(DEFAULT_PACKAGE_NAME);
+        mPicker.onRadioButtonClicked(defaultPackagePref);
+
+        verify(mWvusWrapper, times(1)).setWebViewProvider(eq(DEFAULT_PACKAGE_NAME));
+        // Ensure we update the list of packages when we click a non-valid package - the list must
+        // have changed, otherwise this click wouldn't fail.
+        verify(mPicker, times(1)).updateCandidates();
+        verify(mWvusWrapper, times(1)).showInvalidChoiceToast(any());
+    }
+
+    @Test
+    public void testFinishIfNotAdmin() {
+        doReturn(false).when(mUserManager).isAdminUser();
+        mPicker.onAttach((Context) mActivity);
+        verify(mActivity, times(1)).finish();
+    }
+
+    @Test
+    public void testNotFinishedIfAdmin() {
+        doReturn(true).when(mUserManager).isAdminUser();
+        mPicker.onAttach((Context) mActivity);
+        verify(mActivity, never()).finish();
+    }
+
+    @Test
+    public void testDisabledReasonNullIfPackagesOk() {
+        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
+        when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
+        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
+
+        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
+        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
+        when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
+
+        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
+        when(wvusWrapper.getPackageInfosAllUsers(
+                any(), eq(DEFAULT_PACKAGE_NAME))).thenReturn(
+                        Arrays.asList(packageForFirstUser, packageForSecondUser));
+
+        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isNull();
+    }
+
+    @Test
+    public void testDisabledReasonForSingleUserDisabledPackage() {
+        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
+        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
+        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
+        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+
+        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
+        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
+                )).thenReturn(Arrays.asList(packageForFirstUser));
+
+        final String EXPECTED_DISABLED_REASON = String.format(
+                "(disabled for user %s)", FIRST_USER.name);
+        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
+                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+    }
+
+    @Test
+    public void testDisabledReasonForSingleUserUninstalledPackage() {
+        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
+        when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
+        when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
+        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+
+        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
+        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
+                )).thenReturn(Arrays.asList(packageForFirstUser));
+
+        final String EXPECTED_DISABLED_REASON = String.format(
+                "(uninstalled for user %s)", FIRST_USER.name);
+        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
+                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+    }
+
+    @Test
+    public void testDisabledReasonSeveralUsers() {
+        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
+        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
+        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
+        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+
+        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
+        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
+        when(packageForSecondUser.isInstalledPackage()).thenReturn(false);
+        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
+
+        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
+        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
+                )).thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
+
+        final String EXPECTED_DISABLED_REASON = String.format(
+                "(disabled for user %s)", FIRST_USER.name);
+        assertThat(mPicker.getDisabledReason(
+                wvusWrapper, mContext,DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+    }
+
+    /**
+     * Ensure we only proclaim a package as uninstalled for a certain user if it's both uninstalled
+     * and disabled.
+     */
+    @Test
+    public void testDisabledReasonUninstalledAndDisabled() {
+        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
+        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
+        when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
+        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+
+        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
+        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
+        when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
+        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
+
+        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
+        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)
+                )).thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
+
+        final String EXPECTED_DISABLED_REASON = String.format(
+                "(uninstalled for user %s)", FIRST_USER.name);
+        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
+                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
index e0a32a4..d32f486 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
@@ -14,21 +14,11 @@
 
 package com.android.settings.webview;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.eq;
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -36,8 +26,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
@@ -45,39 +33,26 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WebViewAppPreferenceControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Context mContext;
 
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private Preference mPreference;
+    private WebViewAppPreferenceController mController;
 
     private static final String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
 
-    @Before public void setUp() {
+    @Before
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mPreferenceScreen.findPreference(any())).thenReturn(mPreference);
+        mController = new WebViewAppPreferenceController(mContext);
     }
 
-    @Test public void testOnActivityResultUpdatesStateOnSuccess() {
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        WebViewAppPreferenceController controller =
-                spy(new WebViewAppPreferenceController(mContext, wvusWrapper));
-
-        controller.displayPreference(mPreferenceScreen); // Makes sure Preference is non-null
-        controller.onActivityResult(Activity.RESULT_OK, new Intent(DEFAULT_PACKAGE_NAME));
-        verify(controller, times(1)).updateState(any());
+    @Test
+    public void testIsAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
     }
 
-    @Test public void testOnActivityResultWithFailure() {
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-
-        WebViewAppPreferenceController controller =
-                spy(new WebViewAppPreferenceController(mContext, wvusWrapper));
-
-        controller.displayPreference(mPreferenceScreen); // Makes sure Preference is non-null
-        controller.onActivityResult(Activity.RESULT_CANCELED, new Intent(DEFAULT_PACKAGE_NAME));
-        verify(controller, times(1)).updateState(any());
+    @Test
+    public void testNeverHandlesClick() {
+        assertThat(mController.handlePreferenceTreeClick(mock(Preference.class))).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
new file mode 100644
index 0000000..c412d55
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.wfd;
+
+import android.app.Activity;
+import android.content.Context;
+import android.media.MediaRouter;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+
+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 static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiDisplaySettingsTest {
+
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private SummaryLoader mSummaryLoader;
+    @Mock
+    private MediaRouter mMediaRouter;
+
+    private SummaryLoader.SummaryProvider mSummaryProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE))
+                .thenReturn(mMediaRouter);
+
+        mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
+                mActivity, mSummaryLoader);
+    }
+
+    @Test
+    public void listenToSummary_disconnected_shouldProvideDisconnectedSummary() {
+        mSummaryProvider.setListening(true);
+
+        verify(mActivity).getString(R.string.disconnected);
+        verify(mActivity, never()).getString(R.string.wifi_display_status_connected);
+    }
+
+    @Test
+    public void listenToSummary_connected_shouldProvideConnectedSummary() {
+        final MediaRouter.RouteInfo route = mock(MediaRouter.RouteInfo.class);
+        when(mMediaRouter.getRouteCount()).thenReturn(1);
+        when(mMediaRouter.getRouteAt(0)).thenReturn(route);
+        when(route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)).thenReturn(true);
+        when(route.isSelected()).thenReturn(true);
+        when(route.isConnecting()).thenReturn(false);
+
+        mSummaryProvider.setListening(true);
+
+        verify(mActivity).getString(R.string.wifi_display_status_connected);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/AllowRecommendationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/AllowRecommendationPreferenceControllerTest.java
deleted file mode 100644
index d33854a..0000000
--- a/tests/robotests/src/com/android/settings/wifi/AllowRecommendationPreferenceControllerTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-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.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AllowRecommendationPreferenceControllerTest {
-
-    private Context mContext;
-    private AllowRecommendationPreferenceController mController;
-
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new AllowRecommendationPreferenceController(mContext);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() {
-        final SwitchPreference pref = new SwitchPreference(mContext);
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_nonMatchingType_shouldDoNothing() {
-        final Preference pref = new Preference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
-    }
-
-
-    @Test
-    public void handlePreferenceTreeClick_matchingKeyAndType_shouldUpdateSetting() {
-        final SwitchPreference pref = new SwitchPreference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        // Turn on
-        pref.setChecked(true);
-        assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0))
-                .isEqualTo(1);
-
-        // Turn off
-        pref.setChecked(false);
-        assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0))
-                .isEqualTo(0);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/AppAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
similarity index 87%
rename from tests/unit/src/com/android/settings/deviceinfo/storage/AppAsyncLoaderTest.java
rename to tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 8d4dd2e..71a1590 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/AppAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -42,7 +42,7 @@
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
-public class AppAsyncLoaderTest {
+public class StorageAsyncLoaderTest {
     @Mock
     private StorageStatsSource mSource;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -51,13 +51,13 @@
     private PackageManagerWrapper mPackageManager;
     ArrayList<ApplicationInfo> mInfo = new ArrayList<>();
 
-    private AppsAsyncLoader mLoader;
+    private StorageAsyncLoader mLoader;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         mInfo = new ArrayList<>();
-        mLoader = new AppsAsyncLoader(mContext, 1, "id", mSource, mPackageManager);
+        mLoader = new StorageAsyncLoader(mContext, 1, "id", mSource, mPackageManager);
         when(mPackageManager.getInstalledApplicationsAsUser(anyInt(), anyInt())).thenReturn(mInfo);
     }
 
@@ -66,7 +66,7 @@
         addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
         addPackage(1002, 0, 100, 1000, ApplicationInfo.CATEGORY_UNDEFINED);
 
-        AppsAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
 
         assertThat(result.gamesSize).isEqualTo(0L);
         assertThat(result.otherAppsSize).isEqualTo(1111L);
@@ -76,7 +76,7 @@
     public void testGamesAreFiltered() throws Exception {
         addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_GAME);
 
-        AppsAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
 
         assertThat(result.gamesSize).isEqualTo(11L);
         assertThat(result.otherAppsSize).isEqualTo(0);
@@ -87,7 +87,7 @@
         addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
         addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
 
-        AppsAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
 
         assertThat(result.otherAppsSize).isEqualTo(11L);
     }
@@ -96,7 +96,7 @@
     public void testCacheIsIgnored() throws Exception {
         addPackage(1001, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
 
-        AppsAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
 
         assertThat(result.otherAppsSize).isEqualTo(11L);
     }