Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id06cc594fd10854bd863ec3f0fe17e96dd595f07
diff --git a/QuickSettings/AndroidManifest.xml b/QuickSettings/AndroidManifest.xml
index 4940c24..570eeba 100644
--- a/QuickSettings/AndroidManifest.xml
+++ b/QuickSettings/AndroidManifest.xml
@@ -28,6 +28,7 @@
         android:icon="@mipmap/ic_launcher_quicksettings"
         android:label="@string/quicksettings_label"
         android:requiredForAllUsers="true"
+        android:supportsRtl="true"
         android:theme="@style/Theme.QuickSettings" >
         <activity
             android:name="QuickSettings"
diff --git a/QuickSettings/res/layout/main_quicksettings.xml b/QuickSettings/res/layout/main_quicksettings.xml
index ec2df3e..0801321 100644
--- a/QuickSettings/res/layout/main_quicksettings.xml
+++ b/QuickSettings/res/layout/main_quicksettings.xml
@@ -37,7 +37,7 @@
         android:id="@+id/main_slider"
         android:layout_width="@dimen/slider_width"
         android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
+        android:layout_gravity="start|center_vertical"
         android:clipToPadding="false"
         android:focusable="false"
         android:focusableInTouchMode="false"
@@ -51,7 +51,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:fontFamily="sans-serif-condensed"
-        android:gravity="left|center_vertical"
+        android:gravity="start|center_vertical"
         android:textAllCaps="true"
         android:textColor="@color/setting_text_title_unfocused_color"
         android:textSize="@dimen/setting_text_title_size" />
diff --git a/QuickSettings/res/layout/setting.xml b/QuickSettings/res/layout/setting.xml
index cfa95c9..2e25751 100644
--- a/QuickSettings/res/layout/setting.xml
+++ b/QuickSettings/res/layout/setting.xml
@@ -30,8 +30,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-condensed"
-        android:paddingEnd="@dimen/setting_text_padding_right"
-        android:paddingStart="@dimen/setting_text_padding_left"
+        android:paddingEnd="@dimen/setting_text_padding_end"
+        android:paddingStart="@dimen/setting_text_padding_start"
         android:textColor="@color/setting_text_title_color"
         android:textSize="@dimen/setting_text_title_size" />
 
@@ -40,8 +40,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif"
-        android:paddingEnd="@dimen/setting_text_padding_right"
-        android:paddingStart="@dimen/setting_text_padding_left"
+        android:paddingEnd="@dimen/setting_text_padding_end"
+        android:paddingStart="@dimen/setting_text_padding_start"
         android:textColor="@color/setting_text_value_color"
         android:textSize="@dimen/setting_text_value_size" />
 
diff --git a/QuickSettings/res/layout/side_quicksettings.xml b/QuickSettings/res/layout/side_quicksettings.xml
index 20fc6c0..d42665a 100644
--- a/QuickSettings/res/layout/side_quicksettings.xml
+++ b/QuickSettings/res/layout/side_quicksettings.xml
@@ -29,8 +29,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/side_panel_title_padding_top"
-        android:paddingStart="@dimen/side_panel_title_padding_left"
-        android:paddingEnd="@dimen/side_panel_title_padding_right"
+        android:paddingStart="@dimen/side_panel_title_padding_start"
+        android:paddingEnd="@dimen/side_panel_title_padding_end"
         android:background="@color/side_panel_title_background">
 
         <TextView android:id="@+id/side_panel_title"
diff --git a/QuickSettings/res/values/dimens.xml b/QuickSettings/res/values/dimens.xml
index ac904a0..c4d586b 100644
--- a/QuickSettings/res/values/dimens.xml
+++ b/QuickSettings/res/values/dimens.xml
@@ -31,8 +31,8 @@
     <dimen name="main_panel_height">90dp</dimen>
 
     <dimen name="side_panel_title_padding_top">27dp</dimen>
-    <dimen name="side_panel_title_padding_left">32dp</dimen>
-    <dimen name="side_panel_title_padding_right">56dp</dimen>
+    <dimen name="side_panel_title_padding_start">32dp</dimen>
+    <dimen name="side_panel_title_padding_end">56dp</dimen>
     <dimen name="side_panel_title_text_height">60dp</dimen>
     <dimen name="side_panel_title_text_size">24sp</dimen>
 
@@ -41,8 +41,8 @@
 
     <dimen name="setting_padding_top">9dp</dimen>
     <dimen name="setting_padding_bottom">16dp</dimen>
-    <dimen name="setting_text_padding_left">32dp</dimen>
-    <dimen name="setting_text_padding_right">56dp</dimen>
+    <dimen name="setting_text_padding_start">32dp</dimen>
+    <dimen name="setting_text_padding_end">56dp</dimen>
     <dimen name="setting_text_title_size">18sp</dimen>
     <dimen name="setting_text_value_size">12sp</dimen>
 
diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 8b4f265..d00fa85 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -38,6 +38,7 @@
         android:icon="@drawable/ic_launcher_settings"
         android:label="@string/settings_app_name"
         android:banner="@drawable/ic_launcher_banner_settings"
+        android:supportsRtl="true"
         android:theme="@style/Theme.Settings" >
 
         <activity
@@ -161,7 +162,13 @@
         <activity
             android:name=".device.StorageResetActivity"
             android:configChanges="keyboard|keyboardHidden|navigation"
-            android:exported="true" />
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".connectivity.NetworkActivity"
             android:configChanges="keyboard|keyboardHidden|navigation"
@@ -304,6 +311,14 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".system.DeveloperOptionsActivity"
@@ -377,6 +392,14 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name=".accessories.BluetoothConnectionsManager" >
+            <intent-filter>
+                <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
+                <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
+                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
         <receiver android:name=".accessories.BluetoothPairingRequest" >
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
diff --git a/Settings/res/drawable-hdpi/ic_settings_google_account.png b/Settings/res/drawable-hdpi/ic_settings_google_account.png
new file mode 100644
index 0000000..9daeec3
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_settings_google_account.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_1.png b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_1.png
new file mode 100644
index 0000000..53d097d
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_1.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_2.png b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_2.png
new file mode 100644
index 0000000..d903f29
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_2.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_3.png b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_3.png
new file mode 100644
index 0000000..b54e793
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_3.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_4.png b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_4.png
new file mode 100644
index 0000000..cc87376
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_lock_signal_4.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_signal_1.png b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_1.png
new file mode 100644
index 0000000..a7e6d07
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_1.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_signal_2.png b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_2.png
new file mode 100644
index 0000000..352038d
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_2.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_signal_3.png b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_3.png
new file mode 100644
index 0000000..bc96c2b
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_3.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wifi_signal_4.png b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_4.png
new file mode 100644
index 0000000..61eac9e
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wifi_signal_4.png
Binary files differ
diff --git a/Settings/res/drawable-hdpi/ic_setup_wps.png b/Settings/res/drawable-hdpi/ic_setup_wps.png
new file mode 100644
index 0000000..affe43b
--- /dev/null
+++ b/Settings/res/drawable-hdpi/ic_setup_wps.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_settings_google_account.png b/Settings/res/drawable-mdpi/ic_settings_google_account.png
new file mode 100644
index 0000000..0d8af1b
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_settings_google_account.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_1.png b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_1.png
new file mode 100644
index 0000000..5605503
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_1.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_2.png b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_2.png
new file mode 100644
index 0000000..d9a4fbf
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_2.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_3.png b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_3.png
new file mode 100644
index 0000000..2a1b380
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_3.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_4.png b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_4.png
new file mode 100644
index 0000000..2256e15
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_lock_signal_4.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_signal_1.png b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_1.png
new file mode 100644
index 0000000..02febdf
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_1.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_signal_2.png b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_2.png
new file mode 100644
index 0000000..6dc1aa0
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_2.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_signal_3.png b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_3.png
new file mode 100644
index 0000000..78c0a3e
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_3.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wifi_signal_4.png b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_4.png
new file mode 100644
index 0000000..624dfdf
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wifi_signal_4.png
Binary files differ
diff --git a/Settings/res/drawable-mdpi/ic_setup_wps.png b/Settings/res/drawable-mdpi/ic_setup_wps.png
new file mode 100644
index 0000000..3cfedd0
--- /dev/null
+++ b/Settings/res/drawable-mdpi/ic_setup_wps.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_settings_google_account.png b/Settings/res/drawable-xhdpi/ic_settings_google_account.png
new file mode 100644
index 0000000..2e6c304
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_settings_google_account.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_1.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_1.png
new file mode 100644
index 0000000..a959626
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_1.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_2.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_2.png
new file mode 100644
index 0000000..d6a5c57
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_2.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_3.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_3.png
new file mode 100644
index 0000000..8f84143
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_3.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_4.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_4.png
new file mode 100644
index 0000000..42306d4
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_lock_signal_4.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_1.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_1.png
new file mode 100644
index 0000000..b303ea7
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_1.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_2.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_2.png
new file mode 100644
index 0000000..c6278cf
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_2.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_3.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_3.png
new file mode 100644
index 0000000..82580ca
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_3.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_4.png b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_4.png
new file mode 100644
index 0000000..7f38d47
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wifi_signal_4.png
Binary files differ
diff --git a/Settings/res/drawable-xhdpi/ic_setup_wps.png b/Settings/res/drawable-xhdpi/ic_setup_wps.png
new file mode 100644
index 0000000..4ba4c9b
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_setup_wps.png
Binary files differ
diff --git a/Settings/res/drawable-xxhdpi/ic_settings_google_account.png b/Settings/res/drawable-xxhdpi/ic_settings_google_account.png
new file mode 100644
index 0000000..ea6d148
--- /dev/null
+++ b/Settings/res/drawable-xxhdpi/ic_settings_google_account.png
Binary files differ
diff --git a/Settings/res/drawable/setup_wifi_signal_lock.xml b/Settings/res/drawable/setup_wifi_signal_lock.xml
index 6515353..7e78b1c 100644
--- a/Settings/res/drawable/setup_wifi_signal_lock.xml
+++ b/Settings/res/drawable/setup_wifi_signal_lock.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_setup_wifi_lock_signal_1" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_setup_wifi_lock_signal_2" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_setup_wifi_lock_signal_3" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_setup_wifi_lock_signal_4" />
 </level-list>
diff --git a/Settings/res/drawable/setup_wifi_signal_open.xml b/Settings/res/drawable/setup_wifi_signal_open.xml
index 9f7152b..1b6ee5e 100644
--- a/Settings/res/drawable/setup_wifi_signal_open.xml
+++ b/Settings/res/drawable/setup_wifi_signal_open.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_setup_wifi_signal_1" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_setup_wifi_signal_2" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_setup_wifi_signal_3" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_setup_wifi_signal_4" />
 </level-list>
 
diff --git a/Settings/res/layout-notouch/add_accessory_content_fragment.xml b/Settings/res/layout-notouch/add_accessory_content_fragment.xml
index df77eda..f53e9bc 100644
--- a/Settings/res/layout-notouch/add_accessory_content_fragment.xml
+++ b/Settings/res/layout-notouch/add_accessory_content_fragment.xml
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/add_accessory_padding_left"
+        android:layout_marginStart="@dimen/add_accessory_padding_start"
         android:maxLines="1"
         android:ellipsize="end"
         android:text="@string/accessories_add_title" />
@@ -32,10 +32,10 @@
         android:id="@+id/progress_bar"
         style="@android:style/Widget.Holo.ProgressBar.Horizontal"
         android:layout_below="@id/title"
-        android:layout_alignLeft="@id/title"
+        android:layout_alignStart="@id/title"
         android:layout_width="600dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="40dp"
+        android:layout_marginEnd="40dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
         android:indeterminate="true"
@@ -48,8 +48,8 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_below="@id/progress_bar"
-        android:layout_alignLeft="@id/title"
-        android:layout_marginLeft="-7dp"
+        android:layout_alignStart="@id/title"
+        android:layout_marginStart="-7dp"
         android:scaleType="fitCenter" />
 
     <TextView
@@ -58,8 +58,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/progress_bar"
-        android:layout_toRightOf="@id/bt_symbol"
-        android:layout_marginRight="60dp"
+        android:layout_toEndOf="@id/bt_symbol"
+        android:layout_marginEnd="60dp"
         android:maxLines="2"
         android:ellipsize="end"
         android:text="@string/accessories_add_bluetooth_inst" />
@@ -70,7 +70,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/bt_symbol"
-        android:layout_alignLeft="@id/title"
+        android:layout_alignStart="@id/title"
         android:maxLines="2"
         android:ellipsize="end"
         android:visibility="gone" />
diff --git a/Settings/res/layout-notouch/add_accessory_custom_two_pane_dialog.xml b/Settings/res/layout-notouch/add_accessory_custom_two_pane_dialog.xml
index bf5ed77..de6a350 100644
--- a/Settings/res/layout-notouch/add_accessory_custom_two_pane_dialog.xml
+++ b/Settings/res/layout-notouch/add_accessory_custom_two_pane_dialog.xml
@@ -24,14 +24,14 @@
         <FrameLayout android:id="@+id/action_fragment"
             android:layout_width="384dip"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:background="@color/action_fragment_background"
             />
         <FrameLayout android:id="@+id/content_fragment"
             android:layout_width="576dp"
             android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@id/action_fragment"
+            android:layout_alignParentStart="true"
+            android:layout_toStartOf="@id/action_fragment"
             />
     </RelativeLayout>
 </FrameLayout>
diff --git a/Settings/res/layout-notouch/add_accessory_multiple_content_fragment.xml b/Settings/res/layout-notouch/add_accessory_multiple_content_fragment.xml
index 33713aa..51155fa 100644
--- a/Settings/res/layout-notouch/add_accessory_multiple_content_fragment.xml
+++ b/Settings/res/layout-notouch/add_accessory_multiple_content_fragment.xml
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="50dp"
+        android:layout_marginStart="50dp"
         android:maxLines="1"
         android:ellipsize="end"
         android:text="@string/accessories_add_title_multiple" />
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/multiple_title"
-        android:layout_alignLeft="@id/multiple_title"
+        android:layout_alignStart="@id/multiple_title"
         android:layout_marginBottom="16dp"
         android:scaleType="fitCenter" />
 
@@ -45,7 +45,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/multiple_title"
-        android:layout_alignLeft="@id/multiple_title"
+        android:layout_alignStart="@id/multiple_title"
         android:maxLines="1"
         android:ellipsize="end"
         android:text="@string/accessories_add_multiple" />
@@ -54,10 +54,10 @@
         android:id="@+id/progress_bar"
         style="@android:style/Widget.Holo.ProgressBar.Horizontal"
         android:layout_below="@id/multiple_instructions"
-        android:layout_alignLeft="@id/multiple_title"
+        android:layout_alignStart="@id/multiple_title"
         android:layout_width="600dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="40dp"
+        android:layout_marginEnd="40dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
         android:indeterminate="true"
@@ -72,8 +72,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/progress_bar"
-        android:layout_alignLeft="@id/multiple_title"
-        android:layout_marginRight="60dp"
+        android:layout_alignStart="@id/multiple_title"
+        android:layout_marginEnd="60dp"
         android:maxLines="2"
         android:ellipsize="end"
         android:text="@string/accessories_add_multiple_select" />
diff --git a/Settings/res/layout-notouch/bt_pairing_passkey_display.xml b/Settings/res/layout-notouch/bt_pairing_passkey_display.xml
index be15277..3eac2de 100644
--- a/Settings/res/layout-notouch/bt_pairing_passkey_display.xml
+++ b/Settings/res/layout-notouch/bt_pairing_passkey_display.xml
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="50dp"
+        android:layout_marginStart="50dp"
         android:maxLines="1"
         android:ellipsize="end" />
 
@@ -44,8 +44,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/title"
-        android:layout_alignLeft="@id/title"
-        android:layout_marginRight="50dp"
+        android:layout_alignStart="@id/title"
+        android:layout_marginEnd="50dp"
         android:maxLines="4"
         android:ellipsize="end" />
 
diff --git a/Settings/res/layout-notouch/bt_pairing_passkey_entry.xml b/Settings/res/layout-notouch/bt_pairing_passkey_entry.xml
index b972604..b4359b4 100644
--- a/Settings/res/layout-notouch/bt_pairing_passkey_entry.xml
+++ b/Settings/res/layout-notouch/bt_pairing_passkey_entry.xml
@@ -19,23 +19,23 @@
     <TextView
         android:id="@+id/title_text"
         style="@style/Theme.Settings.BluetoothPairing"
-        android:layout_marginLeft="@dimen/add_accessory_padding_left"
+        android:layout_marginStart="@dimen/add_accessory_padding_start"
         android:layout_width="@dimen/width_description"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true" />
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_marginLeft="@dimen/pad_left_unsafe_action"
+        android:layout_marginStart="@dimen/pad_start_unsafe_action"
         android:layout_width="@dimen/width_action"
-        android:paddingRight="@dimen/pad_right_unsafe_action"
+        android:paddingEnd="@dimen/pad_end_unsafe_action"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
-        android:layout_toRightOf="@id/title_text">
+        android:layout_toEndOf="@id/title_text">
         <EditText
             android:id="@+id/text_input"
             android:layout_width="@dimen/edit_text_width_default"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:focusable="true"
             android:imeOptions="actionNext|flagNoExtractUi"
@@ -48,9 +48,9 @@
             style="@style/HintText"
             android:layout_width="@dimen/edit_text_width_default"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/bt_secure_pair_hint_left_margin"
+            android:layout_marginStart="@dimen/bt_secure_pair_hint_start_margin"
             android:layout_marginTop="@dimen/bt_secure_pair_hint_top_margin"
             android:layout_below="@id/text_input"
-            android:layout_alignLeft="@id/text_input" />
+            android:layout_alignStart="@id/text_input" />
     </RelativeLayout>
 </RelativeLayout>
diff --git a/Settings/res/layout-notouch/lb_dialog_action_list_item.xml b/Settings/res/layout-notouch/lb_dialog_action_list_item.xml
index 6820ee3..ada24a1 100644
--- a/Settings/res/layout-notouch/lb_dialog_action_list_item.xml
+++ b/Settings/res/layout-notouch/lb_dialog_action_list_item.xml
@@ -21,8 +21,8 @@
     android:focusable="true"
     android:minHeight="@dimen/lb_dialog_list_item_min_height"
     android:paddingBottom="@dimen/lb_dialog_list_item_vertical_padding"
-    android:paddingLeft="@dimen/lb_dialog_list_item_left_padding"
-    android:paddingRight="@dimen/lb_dialog_list_item_right_padding"
+    android:paddingStart="@dimen/lb_dialog_list_item_start_padding"
+    android:paddingEnd="@dimen/lb_dialog_list_item_end_padding"
     android:paddingTop="@dimen/lb_dialog_list_item_vertical_padding" >
 
     <ImageView
@@ -30,7 +30,7 @@
         android:layout_width="@dimen/lb_dialog_list_item_checkmark_diameter"
         android:layout_height="@dimen/lb_dialog_list_item_checkmark_diameter"
         android:layout_gravity="center"
-        android:layout_marginRight="@dimen/lb_dialog_list_item_delimiter_padding"
+        android:layout_marginEnd="@dimen/lb_dialog_list_item_delimiter_padding"
         android:scaleType="center"
         android:src="@drawable/lb_dialog_list_item_checkmark"
         android:visibility="invisible"
@@ -41,7 +41,7 @@
         android:layout_width="@dimen/lb_dialog_list_item_icon_width"
         android:layout_height="@dimen/lb_dialog_list_item_icon_height"
         android:layout_gravity="center"
-        android:layout_marginRight="@dimen/lb_dialog_list_item_delimiter_padding"
+        android:layout_marginEnd="@dimen/lb_dialog_list_item_delimiter_padding"
         android:scaleType="fitCenter"
         android:visibility="gone"
         tools:ignore="ContentDescription" />
@@ -50,27 +50,27 @@
         android:id="@+id/action_content"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
+        android:layout_gravity="start|center_vertical"
         android:layout_weight="1"
         android:orientation="vertical" >
 
-        <TextView
+        <com.android.tv.settings.widget.ResizingTextView
             android:id="@+id/action_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="@string/lb_dialog_list_item_unselected_text_alpha"
-            android:ellipsize="marquee"
+            android:ellipsize="end"
             android:fontFamily="sans-serif-condensed"
             android:maxLines="@integer/lb_dialog_action_title_min_lines"
             android:textColor="@color/lb_dialog_list_item_unselected_text_color"
             android:textSize="@dimen/lb_dialog_list_item_title_font_size" />
 
-        <TextView
+        <com.android.tv.settings.widget.ResizingTextView
             android:id="@+id/action_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="@string/lb_dialog_list_item_unselected_text_alpha"
-            android:ellipsize="marquee"
+            android:ellipsize="end"
             android:fontFamily="sans-serif-condensed"
             android:maxLines="@integer/lb_dialog_action_description_min_lines"
             android:textColor="@color/lb_dialog_list_item_unselected_text_color"
@@ -83,7 +83,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginLeft="@dimen/lb_dialog_list_item_delimiter_padding"
+        android:layout_marginStart="@dimen/lb_dialog_list_item_delimiter_padding"
         android:scaleType="fitCenter"
         android:src="@drawable/lb_ic_list_chevron"
         android:visibility="gone"
diff --git a/Settings/res/layout-notouch/lb_dialog_content.xml b/Settings/res/layout-notouch/lb_dialog_content.xml
index de062ae..1fa6919 100644
--- a/Settings/res/layout-notouch/lb_dialog_content.xml
+++ b/Settings/res/layout-notouch/lb_dialog_content.xml
@@ -22,16 +22,16 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="@dimen/lb_content_fragment_left_padding"
-        android:paddingRight="@dimen/lb_content_fragment_delimiter_padding" >
+        android:paddingStart="@dimen/lb_content_fragment_start_padding"
+        android:paddingEnd="@dimen/lb_content_fragment_delimiter_padding" >
 
         <ImageView
             android:id="@+id/icon"
             android:layout_width="@dimen/lb_content_fragment_icon_width"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/lb_content_fragment_delimiter_padding"
+            android:layout_marginStart="@dimen/lb_content_fragment_delimiter_padding"
             android:maxHeight="@dimen/lb_content_fragment_max_icon_height"
             android:scaleType="fitCenter"
             tools:ignore="ContentDescription" />
@@ -42,10 +42,10 @@
             android:layout_height="wrap_content"
             android:layout_alignWithParentIfMissing="true"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/icon"
+            android:layout_toStartOf="@id/icon"
             android:ellipsize="end"
             android:fontFamily="sans-serif-light"
-            android:gravity="right"
+            android:gravity="end"
             android:maxLines="2"
             android:paddingBottom="@dimen/lb_content_fragment_title_text_bottom_padding"
             android:paddingTop="@dimen/lb_content_fragment_title_text_top_padding"
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_above="@id/title"
             android:layout_alignWithParentIfMissing="true"
-            android:layout_toLeftOf="@id/icon"
+            android:layout_toStartOf="@id/icon"
             android:ellipsize="end"
             android:fontFamily="sans-serif-condensed"
             android:singleLine="true"
@@ -71,10 +71,10 @@
             android:layout_height="wrap_content"
             android:layout_alignWithParentIfMissing="true"
             android:layout_below="@id/title"
-            android:layout_toLeftOf="@id/icon"
+            android:layout_toStartOf="@id/icon"
             android:ellipsize="end"
             android:fontFamily="sans-serif"
-            android:gravity="right"
+            android:gravity="end"
             android:maxLines="6"
             android:textColor="@color/lb_content_description_text_color"
             android:textSize="@dimen/lb_content_fragment_description_text_size" 
diff --git a/Settings/res/layout-notouch/lb_dialog_fragment.xml b/Settings/res/layout-notouch/lb_dialog_fragment.xml
index 9a19c44..726619a 100644
--- a/Settings/res/layout-notouch/lb_dialog_fragment.xml
+++ b/Settings/res/layout-notouch/lb_dialog_fragment.xml
@@ -23,7 +23,7 @@
         android:id="@+id/action_fragment"
         android:layout_width="@dimen/lb_action_section_width"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:background="@color/lb_action_fragment_background"
         android:clipChildren="true" />
 
@@ -31,8 +31,8 @@
         android:id="@+id/content_fragment"
         android:layout_width="@dimen/lb_content_section_width"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/action_fragment"
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@id/action_fragment"
         android:clipChildren="true" />
 
 </RelativeLayout>
diff --git a/Settings/res/layout-notouch/lb_dialog_static_list_item.xml b/Settings/res/layout-notouch/lb_dialog_static_list_item.xml
index 4feac7d..1607ed0 100644
--- a/Settings/res/layout-notouch/lb_dialog_static_list_item.xml
+++ b/Settings/res/layout-notouch/lb_dialog_static_list_item.xml
@@ -21,8 +21,8 @@
     android:focusable="true"
     android:minHeight="@dimen/lb_dialog_list_item_min_height"
     android:paddingBottom="@dimen/lb_dialog_list_item_vertical_padding"
-    android:paddingLeft="@dimen/lb_dialog_list_item_left_padding"
-    android:paddingRight="@dimen/lb_dialog_list_item_right_padding"
+    android:paddingStart="@dimen/lb_dialog_list_item_start_padding"
+    android:paddingEnd="@dimen/lb_dialog_list_item_end_padding"
     android:paddingTop="@dimen/lb_dialog_list_item_vertical_padding" >
 
     <ImageView
@@ -30,7 +30,7 @@
         android:layout_width="@dimen/lb_dialog_list_item_checkmark_diameter"
         android:layout_height="@dimen/lb_dialog_list_item_checkmark_diameter"
         android:layout_gravity="center"
-        android:layout_marginRight="@dimen/lb_dialog_list_item_delimiter_padding"
+        android:layout_marginEnd="@dimen/lb_dialog_list_item_delimiter_padding"
         android:scaleType="center"
         android:src="@drawable/lb_dialog_list_item_checkmark"
         android:visibility="invisible"
@@ -41,7 +41,7 @@
         android:layout_width="@dimen/lb_dialog_list_item_icon_width"
         android:layout_height="@dimen/lb_dialog_list_item_icon_height"
         android:layout_gravity="center"
-        android:layout_marginRight="@dimen/lb_dialog_list_item_delimiter_padding"
+        android:layout_marginEnd="@dimen/lb_dialog_list_item_delimiter_padding"
         android:scaleType="fitCenter"
         android:visibility="gone"
         tools:ignore="ContentDescription" />
@@ -50,7 +50,7 @@
         android:id="@+id/action_content"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
+        android:layout_gravity="start|center_vertical"
         android:layout_weight="1"
         android:orientation="vertical" >
 
@@ -79,7 +79,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginLeft="@dimen/lb_dialog_list_item_delimiter_padding"
+        android:layout_marginStart="@dimen/lb_dialog_list_item_delimiter_padding"
         android:scaleType="fitCenter"
         android:src="@drawable/lb_ic_list_chevron"
         android:visibility="gone"
diff --git a/Settings/res/layout-notouch/notification_content_fragment.xml b/Settings/res/layout-notouch/notification_content_fragment.xml
index cd56f67..e833db5 100644
--- a/Settings/res/layout-notouch/notification_content_fragment.xml
+++ b/Settings/res/layout-notouch/notification_content_fragment.xml
@@ -17,16 +17,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/content_fragment_left_padding"
-    android:paddingRight="@dimen/content_fragment_delimiter_padding" >
+    android:paddingStart="@dimen/content_fragment_start_padding"
+    android:paddingEnd="@dimen/content_fragment_delimiter_padding" >
 
     <FrameLayout
         android:id="@+id/icon"
         android:layout_width="@dimen/content_fragment_icon_width"
         android:layout_height="@dimen/content_fragment_icon_height"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/content_fragment_delimiter_padding" >
+        android:layout_marginStart="@dimen/content_fragment_delimiter_padding" >
 
         <ImageView
             android:id="@+id/icon_big"
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:layout_alignWithParentIfMissing="true"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@id/icon"
+        android:layout_toStartOf="@id/icon"
         android:ellipsize="end"
         android:singleLine="true" />
 
@@ -64,7 +64,7 @@
         android:layout_height="wrap_content"
         android:layout_above="@id/title"
         android:layout_alignWithParentIfMissing="true"
-        android:layout_toLeftOf="@id/icon"
+        android:layout_toStartOf="@id/icon"
         android:ellipsize="end"
         android:singleLine="true" />
 
@@ -75,7 +75,7 @@
         android:layout_height="wrap_content"
         android:layout_alignWithParentIfMissing="true"
         android:layout_below="@id/title"
-        android:layout_toLeftOf="@id/icon"
+        android:layout_toStartOf="@id/icon"
         android:ellipsize="end"
         android:maxLines="3" />
 
diff --git a/Settings/res/layout-notouch/remote_settings.xml b/Settings/res/layout-notouch/remote_settings.xml
index a7ff5e1..09c7a92 100644
--- a/Settings/res/layout-notouch/remote_settings.xml
+++ b/Settings/res/layout-notouch/remote_settings.xml
@@ -27,8 +27,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|top"
         android:paddingBottom="@dimen/progress_bar_vertical_padding"
-        android:paddingLeft="@dimen/progress_bar_horizontal_padding"
-        android:paddingRight="@dimen/progress_bar_horizontal_padding"
+        android:paddingStart="@dimen/progress_bar_horizontal_padding"
+        android:paddingEnd="@dimen/progress_bar_horizontal_padding"
         android:paddingTop="@dimen/progress_bar_vertical_padding" >
     </FrameLayout>
 
diff --git a/Settings/res/layout-notouch/wifi_settings.xml b/Settings/res/layout-notouch/wifi_settings.xml
index 76b57d0..4162321 100644
--- a/Settings/res/layout-notouch/wifi_settings.xml
+++ b/Settings/res/layout-notouch/wifi_settings.xml
@@ -16,8 +16,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/pad_left_unsafe_description"
-    android:paddingRight="@dimen/pad_right_unsafe_action"
+    android:paddingStart="@dimen/pad_start_unsafe_description"
+    android:paddingEnd="@dimen/pad_end_unsafe_action"
     android:paddingTop="@dimen/progress_bar_vertical_padding"
     android:paddingBottom="@dimen/progress_bar_vertical_padding"
     android:orientation="vertical">
diff --git a/Settings/res/layout-notouch/wps_fragment.xml b/Settings/res/layout-notouch/wps_fragment.xml
index fe1e546..6a7a003 100644
--- a/Settings/res/layout-notouch/wps_fragment.xml
+++ b/Settings/res/layout-notouch/wps_fragment.xml
@@ -29,7 +29,7 @@
         style="@android:style/Widget.Holo.ProgressBar.Horizontal"
         android:layout_width="600dp"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
+        android:layout_alignStart="@id/title"
         android:layout_below="@id/title"
         android:layout_marginBottom="5dp"
         android:layout_marginTop="5dp"
@@ -41,8 +41,8 @@
         style="@style/HintText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
+        android:layout_alignStart="@id/title"
         android:layout_below="@id/progress_bar"
-        android:drawableLeft="@drawable/ic_wps" />
+        android:drawableStart="@drawable/ic_wps" />
 
 </RelativeLayout>
diff --git a/Settings/res/layout/account_content_area.xml b/Settings/res/layout/account_content_area.xml
index 6db2156..0ee8e10 100644
--- a/Settings/res/layout/account_content_area.xml
+++ b/Settings/res/layout/account_content_area.xml
@@ -25,9 +25,9 @@
         android:id="@+id/description"
         android:layout_width="@dimen/width_description"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/pad_left_unsafe_description"
+        android:layout_marginStart="@dimen/pad_start_unsafe_description"
         android:gravity="center" />
 
     <FrameLayout
@@ -35,8 +35,8 @@
         android:layout_width="@dimen/width_action"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/pad_left_unsafe_action"
-        android:layout_toRightOf="@id/description"
-        android:paddingRight="@dimen/pad_right_unsafe_action" />
+        android:layout_marginStart="@dimen/pad_start_unsafe_action"
+        android:layout_toEndOf="@id/description"
+        android:paddingEnd="@dimen/pad_end_unsafe_action" />
 
 </RelativeLayout>
diff --git a/Settings/res/layout/browse_item.xml b/Settings/res/layout/browse_item.xml
index f9e34f0..4271216 100644
--- a/Settings/res/layout/browse_item.xml
+++ b/Settings/res/layout/browse_item.xml
@@ -32,12 +32,12 @@
         android:scaleType="fitCenter"
         tools:ignore="ContentDescription" />
 
-    <TextView
+    <com.android.tv.settings.widget.ResizingTextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/browse_item_text_marginHor"
-        android:layout_marginRight="@dimen/browse_item_text_marginHor"
+        android:layout_marginStart="@dimen/browse_item_text_marginHor"
+        android:layout_marginEnd="@dimen/browse_item_text_marginHor"
         android:layout_marginBottom="@dimen/browse_item_title_marginBottom"
         android:layout_alignParentBottom="true"
         android:ellipsize="end"
@@ -53,8 +53,8 @@
         android:id="@+id/description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/browse_item_text_marginHor"
-        android:layout_marginRight="@dimen/browse_item_text_marginHor"
+        android:layout_marginStart="@dimen/browse_item_text_marginHor"
+        android:layout_marginEnd="@dimen/browse_item_text_marginHor"
         android:layout_marginBottom="@dimen/browse_item_description_marginBottom"
         android:layout_alignParentBottom="true"
         android:ellipsize="end"
diff --git a/Settings/res/layout/content_fragment.xml b/Settings/res/layout/content_fragment.xml
index 37c5b3f..994d246 100644
--- a/Settings/res/layout/content_fragment.xml
+++ b/Settings/res/layout/content_fragment.xml
@@ -24,17 +24,17 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="@dimen/content_fragment_left_padding"
-        android:paddingRight="@dimen/content_fragment_delimiter_padding" >
+        android:paddingStart="@dimen/content_fragment_start_padding"
+        android:paddingEnd="@dimen/content_fragment_delimiter_padding" >
 
         <ImageView
             android:id="@+id/icon"
             style="@style/Canvas.Image.Dialog.Content.Icon"
             android:layout_width="@dimen/content_fragment_icon_width"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/content_fragment_delimiter_padding"
+            android:layout_marginStart="@dimen/content_fragment_delimiter_padding"
             android:padding="@dimen/icon_padding"
             android:scaleType="fitCenter"
             tools:ignore="ContentDescription" />
@@ -46,9 +46,9 @@
             android:layout_height="wrap_content"
             android:layout_alignWithParentIfMissing="true"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/icon"
+            android:layout_toStartOf="@id/icon"
             android:ellipsize="end"
-            android:gravity="right"
+            android:gravity="end"
             android:maxLines="2" />
 
         <TextView
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_above="@id/title"
             android:layout_alignWithParentIfMissing="true"
-            android:layout_toLeftOf="@id/icon"
+            android:layout_toStartOf="@id/icon"
             android:ellipsize="end"
             android:singleLine="true" />
 
@@ -69,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_alignWithParentIfMissing="true"
             android:layout_below="@id/title"
-            android:layout_toLeftOf="@id/icon"
+            android:layout_toStartOf="@id/icon"
             android:ellipsize="end"
             android:maxLines="6" />
     </RelativeLayout>
diff --git a/Settings/res/layout/license_activity.xml b/Settings/res/layout/license_activity.xml
deleted file mode 100644
index 58b7082..0000000
--- a/Settings/res/layout/license_activity.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="32dip"
-    >
-    <TextView
-        android:id="@+id/license_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginRight="16dip"
-        android:text="@string/about_legal_license"
-        style="@style/Canvas.Text.Dialog.Content.Title"
-        />
-    <WebView android:id="@+id/license"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/license_title"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        />
-</RelativeLayout>
diff --git a/Settings/res/layout/list_item_wifi.xml b/Settings/res/layout/list_item_wifi.xml
index b44ee47..b2bf437 100644
--- a/Settings/res/layout/list_item_wifi.xml
+++ b/Settings/res/layout/list_item_wifi.xml
@@ -26,14 +26,14 @@
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true" />
 
     <TextView
         android:id="@+id/title"
         android:layout_gravity="center_vertical"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@+id/icon"
+        android:layout_toEndOf="@+id/icon"
         style="@style/SettingsStyle.TextAppearanceMedium" />
 
 </RelativeLayout>
diff --git a/Settings/res/layout/navigable_webview.xml b/Settings/res/layout/navigable_webview.xml
index 4ea098a..80ebcb0 100644
--- a/Settings/res/layout/navigable_webview.xml
+++ b/Settings/res/layout/navigable_webview.xml
@@ -18,9 +18,9 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         android:paddingBottom="@dimen/tos_webview_padding_without_progress_bar"
-        android:paddingRight="@dimen/tos_webview_padding_without_progress_bar"
-        android:paddingLeft="@dimen/tos_webview_padding_without_progress_bar"
-        android:paddingTop="@dimen/tos_webview_padding_with_progress_bar" >
+        android:paddingEnd="@dimen/tos_webview_padding_without_progress_bar"
+        android:paddingStart="@dimen/tos_webview_padding_without_progress_bar"
+        android:paddingTop="@dimen/tos_webview_padding_without_progress_bar" >
     <WebView
         android:id="@+id/webview"
         android:focusable="true"
diff --git a/Settings/res/layout/password_text_input.xml b/Settings/res/layout/password_text_input.xml
index 5f44f66..ffd4624 100644
--- a/Settings/res/layout/password_text_input.xml
+++ b/Settings/res/layout/password_text_input.xml
@@ -21,7 +21,7 @@
         android:id="@+id/text_input"
         android:layout_width="@dimen/edit_text_width_default"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:focusable="true"
         android:imeOptions="actionNext|flagNoExtractUi"
@@ -36,7 +36,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/text_input"
-        android:layout_toRightOf="@id/text_input"
+        android:layout_toEndOf="@id/text_input"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:visibility="gone" />
 
diff --git a/Settings/res/layout/picker.xml b/Settings/res/layout/picker.xml
index a660f71..c3d0953 100644
--- a/Settings/res/layout/picker.xml
+++ b/Settings/res/layout/picker.xml
@@ -34,6 +34,6 @@
         android:focusable="false"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/picker_left_padding" />
+        android:paddingStart="@dimen/picker_start_padding" />
 
 </RelativeLayout>
diff --git a/Settings/res/layout/picker_column.xml b/Settings/res/layout/picker_column.xml
index 942d8de..9fcc6f9 100644
--- a/Settings/res/layout/picker_column.xml
+++ b/Settings/res/layout/picker_column.xml
@@ -21,8 +21,8 @@
     android:clipToPadding="false"
     android:enabled="true"
     android:focusable="true"
-    android:paddingLeft="@dimen/picker_column_horizontal_padding"
-    android:paddingRight="@dimen/picker_column_horizontal_padding"
+    android:paddingStart="@dimen/picker_column_horizontal_padding"
+    android:paddingEnd="@dimen/picker_column_horizontal_padding"
     android:requiresFadingEdge="vertical"
     android:visibility="visible"
     settings:navigateOutAllowed="false"
diff --git a/Settings/res/layout/picker_separator.xml b/Settings/res/layout/picker_separator.xml
index 0c54b15..f7e4f21 100644
--- a/Settings/res/layout/picker_separator.xml
+++ b/Settings/res/layout/picker_separator.xml
@@ -20,6 +20,6 @@
     android:layout_height="wrap_content"
     android:alpha="@dimen/picker_item_separator_alpha"
     android:focusable="false"
-    android:paddingLeft="@dimen/picker_separator_horizontal_padding"
-    android:paddingRight="@dimen/picker_separator_horizontal_padding"
+    android:paddingStart="@dimen/picker_separator_horizontal_padding"
+    android:paddingEnd="@dimen/picker_separator_horizontal_padding"
     android:textColor="@color/list_item_unselected_text_color" />
diff --git a/Settings/res/layout/pin_dialog.xml b/Settings/res/layout/pin_dialog.xml
index 40ea26b..7722706 100644
--- a/Settings/res/layout/pin_dialog.xml
+++ b/Settings/res/layout/pin_dialog.xml
@@ -18,8 +18,8 @@
     android:layout_height="@dimen/pin_dialog_height"
     android:paddingTop="@dimen/pin_dialog_top_padding"
     android:paddingBottom="@dimen/pin_dialog_bottom_padding"
-    android:paddingLeft="@dimen/pin_dialog_horizontal_padding"
-    android:paddingRight="@dimen/pin_dialog_horizontal_padding"
+    android:paddingStart="@dimen/pin_dialog_horizontal_padding"
+    android:paddingEnd="@dimen/pin_dialog_horizontal_padding"
     android:elevation="@dimen/pin_dialog_elevation"
     android:background="@drawable/pin_dialog_background">
 
@@ -51,8 +51,8 @@
         <LinearLayout
             android:layout_width="@dimen/pin_dialog_pin_numbers_width"
             android:layout_height="@dimen/pin_dialog_pin_numbers_height"
-            android:paddingLeft="@dimen/pin_dialog_pin_numbers_horizontal_padding"
-            android:paddingRight="@dimen/pin_dialog_pin_numbers_horizontal_padding"
+            android:paddingStart="@dimen/pin_dialog_pin_numbers_horizontal_padding"
+            android:paddingEnd="@dimen/pin_dialog_pin_numbers_horizontal_padding"
             android:gravity="center"
             android:orientation="horizontal">
 
@@ -65,19 +65,19 @@
                 android:id="@+id/second"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/pin_dialog_pin_number_spacing" />
+                android:layout_marginStart="@dimen/pin_dialog_pin_number_spacing" />
 
             <view class="com.android.tv.dialog.PinDialogFragment$PinNumberPicker"
                 android:id="@+id/third"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/pin_dialog_pin_number_spacing" />
+                android:layout_marginStart="@dimen/pin_dialog_pin_number_spacing" />
 
             <view class="com.android.tv.dialog.PinDialogFragment$PinNumberPicker"
                 android:id="@+id/fourth"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/pin_dialog_pin_number_spacing" />
+                android:layout_marginStart="@dimen/pin_dialog_pin_number_spacing" />
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
diff --git a/Settings/res/layout/settings_list_item.xml b/Settings/res/layout/settings_list_item.xml
index 73f5df1..b243019 100644
--- a/Settings/res/layout/settings_list_item.xml
+++ b/Settings/res/layout/settings_list_item.xml
@@ -28,10 +28,10 @@
         style="@style/Canvas.Image.Dialog.List.Checkmark"
         android:layout_width="@dimen/list_item_checkmark_diameter"
         android:layout_height="@dimen/list_item_checkmark_diameter"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/list_item_left_padding"
-        android:layout_marginRight="@dimen/list_item_delimiter_padding"
+        android:layout_marginStart="@dimen/list_item_start_padding"
+        android:layout_marginEnd="@dimen/list_item_delimiter_padding"
         tools:ignore="ContentDescription" />
 
     <ImageView
@@ -40,8 +40,8 @@
         android:layout_width="@dimen/list_item_icon_width"
         android:layout_height="@dimen/list_item_icon_height"
         android:layout_centerVertical="true"
-        android:layout_marginRight="@dimen/list_item_delimiter_padding"
-        android:layout_toRightOf="@id/action_checkmark"
+        android:layout_marginEnd="@dimen/list_item_delimiter_padding"
+        android:layout_toEndOf="@id/action_checkmark"
         android:scaleType="fitCenter"
         tools:ignore="ContentDescription" />
 
@@ -51,17 +51,17 @@
         android:id="@+id/action_next_chevron_background"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/list_item_delimiter_padding"
-        android:paddingRight="@dimen/list_item_right_padding" >
+        android:layout_marginStart="@dimen/list_item_delimiter_padding"
+        android:paddingEnd="@dimen/list_item_end_padding" >
 
         <ImageView
             android:id="@+id/action_next_chevron"
             style="@style/Canvas.Image.Dialog.List.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="left|center_vertical"
+            android:layout_gravity="start|center_vertical"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_list_chevron"
             tools:ignore="ContentDescription" />
@@ -72,25 +72,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@id/action_next_chevron_background"
-        android:layout_toRightOf="@id/action_icon"
+        android:layout_toStartOf="@id/action_next_chevron_background"
+        android:layout_toEndOf="@id/action_icon"
         android:orientation="vertical" >
 
-        <TextView
+        <com.android.tv.settings.widget.ResizingTextView
             android:id="@+id/action_title"
             style="@style/Canvas.Text.Dialog.List.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxLines="@integer/action_title_min_lines"
-            android:ellipsize="marquee" />
+            android:ellipsize="end" />
 
-        <TextView
+        <com.android.tv.settings.widget.ResizingTextView
             android:id="@+id/action_description"
             style="@style/Canvas.Text.Dialog.List.Description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxLines="@integer/action_description_min_lines"
-            android:ellipsize="marquee" />
+            android:ellipsize="end" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/Settings/res/layout/setup_activity.xml b/Settings/res/layout/setup_activity.xml
index db9ad48..6cc4750 100644
--- a/Settings/res/layout/setup_activity.xml
+++ b/Settings/res/layout/setup_activity.xml
@@ -22,6 +22,6 @@
         android:id="@+id/content_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true" />
 </RelativeLayout>
diff --git a/Settings/res/layout/setup_content_area.xml b/Settings/res/layout/setup_content_area.xml
index b1811db..cc5f47b 100644
--- a/Settings/res/layout/setup_content_area.xml
+++ b/Settings/res/layout/setup_content_area.xml
@@ -20,18 +20,18 @@
     android:layout_height="match_parent">
     <FrameLayout
         android:id="@+id/description"
-        android:layout_marginLeft="@dimen/pad_left_unsafe_description"
+        android:layout_marginStart="@dimen/pad_start_unsafe_description"
         android:layout_width="@dimen/width_description"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:gravity="center"
         android:layout_centerVertical="true"/>
     <FrameLayout
         android:id="@+id/action"
-        android:layout_marginLeft="@dimen/pad_left_unsafe_action"
+        android:layout_marginStart="@dimen/pad_start_unsafe_action"
         android:layout_width="@dimen/width_action"
-        android:paddingRight="@dimen/pad_right_unsafe_action"
+        android:paddingEnd="@dimen/pad_end_unsafe_action"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toRightOf="@id/description"/>
+        android:layout_toEndOf="@id/description"/>
 </RelativeLayout>
diff --git a/Settings/res/layout/setup_list_item.xml b/Settings/res/layout/setup_list_item.xml
index 5865b6f..87a4cd6 100644
--- a/Settings/res/layout/setup_list_item.xml
+++ b/Settings/res/layout/setup_list_item.xml
@@ -15,14 +15,15 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/list_item_height"
-    android:gravity="left|center_vertical"
+    android:gravity="start|center_vertical"
     android:orientation="horizontal">
     <FrameLayout
         android:id="@+id/list_item_icon"
         android:layout_width="@dimen/list_item_icon_size"
-        android:layout_height="@dimen/list_item_icon_size" />
+        android:layout_height="@dimen/list_item_icon_size"
+        android:layout_marginEnd="@dimen/setup_list_item_icon_margin_end" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Settings/res/layout/setup_list_item_header.xml b/Settings/res/layout/setup_list_item_header.xml
index 15c6624..2675f18 100644
--- a/Settings/res/layout/setup_list_item_header.xml
+++ b/Settings/res/layout/setup_list_item_header.xml
@@ -17,7 +17,7 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="@dimen/list_header_height"
-        android:gravity="left|center_vertical"
+        android:gravity="start|center_vertical"
         android:orientation="horizontal">
     <FrameLayout
             android:id="@+id/list_item_icon"
@@ -26,7 +26,7 @@
     <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="@dimen/list_header_height"
-            android:gravity="left|center_vertical"
+            android:gravity="start|center_vertical"
             android:orientation="vertical">
         <TextView
                 android:layout_width="match_parent"
diff --git a/Settings/res/layout/setup_list_item_text_only.xml b/Settings/res/layout/setup_list_item_text_only.xml
index b8ca2fc..6fdbb48 100644
--- a/Settings/res/layout/setup_list_item_text_only.xml
+++ b/Settings/res/layout/setup_list_item_text_only.xml
@@ -17,7 +17,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/list_item_height"
-    android:gravity="left|center_vertical"
+    android:gravity="start|center_vertical"
     android:orientation="horizontal">
     <TextView
         android:layout_width="wrap_content"
diff --git a/Settings/res/layout/setup_text_and_description.xml b/Settings/res/layout/setup_text_and_description.xml
index 059d5f9..0adacb3 100644
--- a/Settings/res/layout/setup_text_and_description.xml
+++ b/Settings/res/layout/setup_text_and_description.xml
@@ -17,7 +17,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="left" >
+    android:gravity="start" >
 
     <TextView
         android:id="@+id/title_text"
diff --git a/Settings/res/layout/toast_notification.xml b/Settings/res/layout/toast_notification.xml
index efd7f7c..4804cdd 100644
--- a/Settings/res/layout/toast_notification.xml
+++ b/Settings/res/layout/toast_notification.xml
@@ -37,7 +37,7 @@
             android:layout_width="80dip"
             android:layout_height="80dip"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/text"
+            android:layout_toStartOf="@id/text"
             android:scaleType="fitCenter"
             android:visibility="gone"
             tools:ignore="ContentDescription" />
diff --git a/Settings/res/layout/two_pane_dialog_frame.xml b/Settings/res/layout/two_pane_dialog_frame.xml
index 80469a1..e9ef582 100644
--- a/Settings/res/layout/two_pane_dialog_frame.xml
+++ b/Settings/res/layout/two_pane_dialog_frame.xml
@@ -23,14 +23,14 @@
         android:id="@+id/action_fragment"
         android:layout_width="384dip"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:background="@color/action_fragment_background" />
 
     <FrameLayout
         android:id="@+id/content_fragment"
         android:layout_width="576dp"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/action_fragment" />
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@id/action_fragment" />
 
 </RelativeLayout>
diff --git a/Settings/res/layout/wifi_content.xml b/Settings/res/layout/wifi_content.xml
index 5296561..58360b2 100644
--- a/Settings/res/layout/wifi_content.xml
+++ b/Settings/res/layout/wifi_content.xml
@@ -17,11 +17,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="left" >
+    android:gravity="start" >
 
     <TextView
         android:id="@+id/title_text"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/setup_title_height"
         android:gravity="bottom"
         android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/Settings/res/layout/wifi_text_input.xml b/Settings/res/layout/wifi_text_input.xml
index 535003d..43195c0 100644
--- a/Settings/res/layout/wifi_text_input.xml
+++ b/Settings/res/layout/wifi_text_input.xml
@@ -21,7 +21,7 @@
         android:id="@+id/text_input"
         android:layout_width="@dimen/edit_text_width_default"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:focusable="true"
         android:imeOptions="actionNext|flagNoExtractUi"
@@ -36,7 +36,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/text_input"
-        android:layout_toRightOf="@id/text_input"
+        android:layout_toEndOf="@id/text_input"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:visibility="gone" />
 
diff --git a/Settings/res/raw-es/additional_terms_of_service.html b/Settings/res/raw-es/additional_terms_of_service.html
deleted file mode 100644
index 7d304c5..0000000
--- a/Settings/res/raw-es/additional_terms_of_service.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Condiciones Adicionales</title><meta content="text/html; charset=UTF-8" http-equiv="content-type"><style type="text/css">@import url('https://themes.googleusercontent.com/fonts/css?kit=m0tazYRimFnV1hoGKbgtnw');ol{margin:0;padding:0}.c2{widows:2;orphans:2;direction:ltr}.c7{max-width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt}.c6{color:#222222;font-size:14pt;font-weight:bold}.c1{color:#222222;font-size:10pt}.c5{color:#222222;background-color:#f9f9f9}.c3{padding-top:14pt;padding-bottom:4pt}.c4{height:11pt}.c8{padding-bottom:4pt}.c0{font-family:"Cambria"}.title{widows:2;padding-top:0pt;line-height:1.15;orphans:2;text-align:left;color:#000000;font-size:21pt;font-family:"Trebuchet MS";padding-bottom:0pt;page-break-after:avoid}.subtitle{widows:2;padding-top:0pt;line-height:1.15;orphans:2;text-align:left;color:#666666;font-style:italic;font-size:13pt;font-family:"Trebuchet MS";padding-bottom:10pt;page-break-after:avoid}li{color:#000000;font-size:11pt;font-family:"Arial"}p{color:#000000;font-size:11pt;margin:0;font-family:"Arial"}h1{widows:2;padding-top:10pt;line-height:1.15;orphans:2;text-align:left;color:#000000;font-size:16pt;font-family:"Trebuchet MS";padding-bottom:0pt;page-break-after:avoid}h2{widows:2;padding-top:10pt;line-height:1.15;orphans:2;text-align:left;color:#000000;font-size:13pt;font-family:"Trebuchet MS";font-weight:bold;padding-bottom:0pt;page-break-after:avoid}h3{widows:2;padding-top:8pt;line-height:1.15;orphans:2;text-align:left;color:#666666;font-size:12pt;font-family:"Trebuchet MS";font-weight:bold;padding-bottom:0pt;page-break-after:avoid}h4{widows:2;padding-top:8pt;line-height:1.15;orphans:2;text-align:left;color:#666666;font-size:11pt;text-decoration:underline;font-family:"Trebuchet MS";padding-bottom:0pt;page-break-after:avoid}h5{widows:2;padding-top:8pt;line-height:1.15;orphans:2;text-align:left;color:#666666;font-size:11pt;font-family:"Trebuchet MS";padding-bottom:0pt;page-break-after:avoid}h6{widows:2;padding-top:8pt;line-height:1.15;orphans:2;text-align:left;color:#666666;font-style:italic;font-size:11pt;font-family:"Trebuchet MS";padding-bottom:0pt;page-break-after:avoid}</style></head><body class="c7"><p class="c2 c8"><span class="c6">Condiciones adicionales</span></p><p class="c2"><span class="c1">&Uacute;ltima modificaci&oacute;n: 1.&ordm; de junio de 2013</span></p><p class="c2 c4"><span class="c1"></span></p><p class="c2"><span class="c0">&nbsp;</span></p><p class="c2"><span class="c1">Estas Condiciones adicionales complementan las Condiciones de servicio de Google, que se aplican cuando utiliza este dispositivo de referencia de programador (en adelante, &quot;Dispositivo&quot;). A los efectos de estas condiciones, el Dispositivo incluye el dispositivo, el c&oacute;digo ejecutable del sistema operativo, el software integrado, el firmware, las fuentes y otros componentes. &nbsp;Si estas Condiciones adicionales y las Condiciones de servicio de Google se contradicen, se priorizar&aacute;n estas Condiciones adicionales.</span></p><p class="c2"><span class="c0">&nbsp;</span></p><p class="c2"><span class="c1">En la medida en que el Dispositivo incluya componentes regidos por licencias de c&oacute;digo abierto, puede obtener informaci&oacute;n relacionada con las licencias de c&oacute;digo abierto en la siguiente ubicaci&oacute;n en el Dispositivo: Acerca de -&gt; Informaci&oacute;n legal -&gt; Licencias de c&oacute;digo abierto.</span></p><p class="c2"><span class="c0">&nbsp;</span></p><p class="c2"><span class="c1">Puede optar por usar ciertas aplicaciones, extensiones, temas y otras Adiciones (&quot;Adiciones&quot;) para el Dispositivo, incluidas algunas que pueden haberse instalado por adelantado. A menos que se indique lo contrario, el uso de las Adiciones que desarrolla y proporciona Google est&aacute; sujeto a las Condiciones de servicio de Google y a la Pol&iacute;tica de privacidad de Google. El uso de Adiciones desarrolladas y proporcionadas por terceros puede estar sujeto a condiciones del servicio y pol&iacute;ticas de privacidad de terceros.</span></p><p class="c2"><span class="c0">&nbsp;</span></p><p class="c2"><span class="c1">De vez en cuando, Google puede descubrir una Adici&oacute;n que infringe las condiciones del programador para el Dispositivo u otros acuerdos legales, leyes, regulaciones o pol&iacute;ticas. &nbsp;El Dispositivo puede descargar peri&oacute;dicamente una lista de estas Adiciones de los servidores de Google. Acepta que Google puede, seg&uacute;n su exclusivo criterio, inhabilitar o eliminar a distancia cualquiera de estas Adiciones de los sistemas del usuario.</span></p><p class="c2 c3"><span class="c6">Renuncia de responsabilidad/Limitaci&oacute;n de responsabilidades</span></p><p class="c2 c3"><span class="c5">ASUME EXPRESAMENTE CUALQUIER RIESGO QUE EL USO DEL DISPOSITIVO PUEDA IMPLICAR, Y RECONOCE Y ACEPTA EXPRESAMENTE QUE EL DISPOSITIVO SE LE PROPORCIONA TAL &quot;COMO ES&quot; Y &quot;EST&Aacute; DISPONIBLE&quot;, SIN NINGUNA GARANT&Iacute;A DE GOOGLE.</span></p><p class="c2 c3 c4"><span class="c5"></span></p><p class="c2 c3"><span class="c5">EL USO QUE HACE DEL DISPOSITIVO CORRE POR SU CUENTA, Y ES EL &Uacute;NICO RESPONSABLE DE CUALQUIER P&Eacute;RDIDA DE DATOS O CUALQUIER DA&Ntilde;O QUE PUEDA SUFRIR SU TV, EL SISTEMA DE SU COMPUTADORA O CUALQUIER DISPOSITIVO A PARTIR DE ESTE USO.</span></p><p class="c2 c3 c4"><span class="c5"></span></p><p class="c2 c3"><span class="c5">ASIMISMO, GOOGLE RENUNCIA EXPRESAMENTE A CUALQUIER TIPO DE GARANT&Iacute;A Y CONDICI&Oacute;N EXPL&Iacute;CITA O IMPL&Iacute;CITA, INCLUIDAS LAS CONDICIONES Y GARANT&Iacute;AS IMPL&Iacute;CITAS DE COMERCIABILIDAD, CUMPLIMIENTO Y ADECUACI&Oacute;N A UN FIN DETERMINADO, ENTRE OTRAS.</span></p><p class="c2 c3 c4"><span class="c5"></span></p><p class="c2 c3"><span class="c5">COMPRENDE Y ACEPTA EXPRESAMENTE QUE GOOGLE, SUS PROVEEDORES DE LICENCIAS, Y SUS FILIALES Y SUS AFILIADOS NO SE RESPONSABILIZAR&Aacute;N ANTE USTED BAJO NINGUNA TEOR&Iacute;A DE RESPONSABILIDAD POR NING&Uacute;N DA&Ntilde;O DIRECTO, INDIRECTO, IMPREVISTO, ESPECIAL, DERIVADO O EJEMPLAR QUE SE PRODUZCA, INCLUIDA LA P&Eacute;RDIDA DE DATOS, AUN CUANDO GOOGLE Y SUS REPRESENTANTES HAYAN SIDO NOTIFICADOS ACERCA DE LA POSIBILIDAD DE QUE SE PRODUZCA ALG&Uacute;N DA&Ntilde;O O DEBIERAN HABER ESTADO AL TANTO DE ELLA.</span></p><p class="c2 c3"><span class="c6">Condiciones adicionales de tecnolog&iacute;a incorporada</span></p><p class="c2 c3"><span class="c6">MPEGLA</span></p><p class="c2"><span class="c1">ESTE PRODUCTO EST&Aacute; PROVISTO DE UNA LICENCIA DE CARTERA DE PATENTES AVC PARA EL USO PERSONAL Y NO COMERCIAL DE UN CONSUMIDOR PARA (i) CODIFICAR VIDEOS DE CONFORMIDAD CON EL EST&Aacute;NDAR AVC (&ldquo;VIDEO AVC&rdquo;) O (ii) DECODIFICAR VIDEOS AVC CODIFICADOS POR UN CONSUMIDOR INVOLUCRADO EN UNA ACTIVIDAD PERSONAL Y NO COMERCIAL O SUMINISTRADOS POR UN SOCIO DE VIDEOS CON LICENCIA PARA PROPORCIONAR VIDEOS AVC. NO SE OTORGA NI QUEDA IMPL&Iacute;CITA NINGUNA LICENCIA PARA CUALQUIER OTRO USO. PUEDE OBTENER INFORMACI&Oacute;N ADICIONAL DE MPEG LA, L.L.C. CONSULTE HTTP://WWW.MPEGLA.COM.</span></p></body></html>
diff --git a/Settings/res/raw-fr/additional_terms_of_service.html b/Settings/res/raw-fr/additional_terms_of_service.html
deleted file mode 100644
index 25ab5ae..0000000
--- a/Settings/res/raw-fr/additional_terms_of_service.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Conditions additionnelles</title><meta content="text/html; charset=UTF-8" http-equiv="content-type"><style type="text/css">@import url('https://themes.googleusercontent.com/fonts/css?kit=wAPX1HepqA24RkYW1AuHYA');ol{margin:0;padding:0}.c4{line-height:1.0;height:11pt;direction:ltr;padding-bottom:0pt}.c1{line-height:1.0;padding-top:18pt;direction:ltr;padding-bottom:4pt}.c7{color:#222222;font-size:14pt;font-family:"Arial";font-weight:bold}.c6{line-height:1.0;padding-top:14pt;direction:ltr;padding-bottom:4pt}.c2{color:#222222;font-size:10pt;font-family:"Arial"}.c0{widows:2;orphans:2;direction:ltr}.c3{max-width:432pt;background-color:#ffffff;padding:72pt 90pt 72pt 90pt}.c5{color:#222222;background-color:#f9f9f9;font-family:"Arial"}.c9{line-height:1.0;direction:ltr;padding-bottom:0pt}.c8{font-size:10pt;font-family:"Arial"}.title{widows:2;padding-top:24pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:36pt;font-family:"Calibri";font-weight:bold;padding-bottom:6pt;page-break-after:avoid}.subtitle{widows:2;padding-top:18pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#666666;font-style:italic;font-size:24pt;font-family:"Georgia";padding-bottom:4pt;page-break-after:avoid}li{color:#000000;font-size:11pt;font-family:"Calibri"}p{color:#000000;font-size:11pt;margin:0;font-family:"Calibri"}h1{widows:2;padding-top:24pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:24pt;font-family:"Calibri";font-weight:bold;padding-bottom:6pt;page-break-after:avoid}h2{widows:2;padding-top:18pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:18pt;font-family:"Calibri";font-weight:bold;padding-bottom:4pt;page-break-after:avoid}h3{widows:2;padding-top:14pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:14pt;font-family:"Calibri";font-weight:bold;padding-bottom:4pt;page-break-after:avoid}h4{widows:2;padding-top:12pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:12pt;font-family:"Calibri";font-weight:bold;padding-bottom:2pt;page-break-after:avoid}h5{widows:2;padding-top:11pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:11pt;font-family:"Calibri";font-weight:bold;padding-bottom:2pt;page-break-after:avoid}h6{widows:2;padding-top:10pt;line-height:1.1500000000000001;orphans:2;text-align:left;color:#000000;font-size:10pt;font-family:"Calibri";font-weight:bold;padding-bottom:2pt;page-break-after:avoid}</style></head><body class="c3"><p class="c1"><a name="h.gjdgxs"></a><span class="c7">Conditions additionnelles</span></p><p class="c9"><span class="c2">Derni&egrave;re modification&nbsp;: 1 juin 2013</span></p><p class="c4"><span class="c2"></span></p><p class="c9"><span class="c2">Ces conditions additionnelles compl&eacute;mentent les Conditions d&rsquo;utilisation de Google, qui s&rsquo;appliquent lorsque vous utilisez cet appareil de r&eacute;f&eacute;rence pour le d&eacute;veloppeur (ci-apr&egrave;s collectivement d&eacute;sign&eacute; comme l&rsquo;&laquo;Appareil&raquo;). Pour les fins de ces conditions, l&rsquo;Appareil inclut l&rsquo;appareil, le code ex&eacute;cutable du syst&egrave;me d&rsquo;exploitation, le logiciel int&eacute;gr&eacute;, le micrologiciel, les polices de caract&egrave;res et autres composantes. En cas de conflit entre les pr&eacute;sentes conditions additionnelles et les Conditions d&rsquo;utilisation de Google, les pr&eacute;sentes conditions additionnelles ont pr&eacute;s&eacute;ance.</span></p><p class="c4"><span class="c2"></span></p><p class="c9"><span class="c2">Dans la mesure o&ugrave; l&rsquo;Appareil inclut des composantes r&eacute;gies par des licences &agrave; source ouverte, vous pouvez obtenir de l&rsquo;information concernant ces licences &agrave; source ouverte &agrave; l&rsquo;emplacement suivant sur l&rsquo;Appareil&nbsp;: </span><span class="c2">&Agrave; propos -&gt; Renseignements juridiques -&gt; </span><span class="c2">Licences de logiciels libres.</span><span class="c2">&nbsp;</span></p><p class="c4"><span class="c2"></span></p><p class="c9"><span class="c2">Vous pouvez choisir d&rsquo;utiliser certaines applications, extensions, th&egrave;mes et autres ajouts (ci-apr&egrave;s &laquo;&nbsp;Ajouts&nbsp;&raquo;) &agrave; l&rsquo;Appareil, incluant certains qui peuvent &ecirc;tre pr&eacute;install&eacute;s. L&rsquo;utilisation que vous faite des Ajouts d&eacute;velopp&eacute;s et fournis par Google est sujette aux Conditions d&rsquo;utilisation de Google et &agrave; la Politique de confidentialit&eacute; de Google, &agrave; moins qu&rsquo;il ne soit indiqu&eacute; autrement. L&rsquo;utilisation que vous faite des Ajouts d&eacute;velopp&eacute;s et fournis par des tiers peut &ecirc;tre sujette &agrave; des conditions et des politiques de confidentialit&eacute; de ces tiers.</span></p><p class="c4"><span class="c2"></span></p><p class="c9"><span class="c2">P&eacute;riodiquement, Google pourrait d&eacute;couvrir un Ajout qui enfreint les conditions du d&eacute;veloppeur pour l&rsquo;Appareil ou d&rsquo;autres ententes juridiques, lois, r&egrave;glements ou politiques. L&rsquo;Appareil pourrait p&eacute;riodiquement t&eacute;l&eacute;charger une liste de tels Ajouts &agrave; partir des serveurs de Google. &nbsp;Vous acceptez que Google puisse, &agrave; distance, d&eacute;sactiver ou &eacute;liminer tout Ajout des syst&egrave;mes d&rsquo;utilisation, &agrave; sa seule discr&eacute;tion.</span></p><p class="c6"><span class="c7">Limitation de responsabilit&eacute;</span></p><p class="c6"><span class="c5">VOUS COMPRENEZ ET ACCEPTEZ EXPRESS&Eacute;MENT QUE VOTRE UTILISATION DE L&rsquo;APPAREIL EST &Agrave; VOS RISQUES ET QUE L&rsquo;APPAREIL EST FOURNI &laquo;&nbsp;TEL QUEL&nbsp;&raquo; ET &laquo;&nbsp;TEL QUE DISPONIBLE&nbsp;&raquo; SANS AUCUNE GARANTIE DE QUELQUE FORME QUI SOIT PAR GOOGLE.</span></p><p class="c6"><span class="c5">L&rsquo;UTILISATION QUE VOUS FAITE DE L&rsquo;APPAREIL EST &Agrave; VOTRE DISCR&Eacute;TION ET VOUS &Ecirc;TES SEUL RESPONSABLE POUR TOUT DOMMAGE &Agrave; VOTRE SYST&Egrave;ME INFORMATIQUE, T&Eacute;L&Eacute;VISION OU AUTRE APPAREIL OU POUR TOUTE PERTE DE DONN&Eacute;ES QUI POURRAIT R&Eacute;SULTER DE CETTE UTILISATION.</span></p><p class="c6"><span class="c5">GOOGLE SE D&Eacute;GAGE EXPRESS&Eacute;EMENT DE TOUTES GARANTIE OU CONDITION DE TOUT GENRE, SOIT EXPRESSE OU IMPLICITE, INCLUANT MAIS SANS Y &Ecirc;TRE LIMIT&Eacute;, LES GARANTIES IMPLICITES DE QUALIT&Eacute; MARCHANDE, D&rsquo;ADAPTATION &Agrave; UN USAGE PARTICULIER OU DE NON CONTRAVENTION &Agrave; LA LOI.</span></p><p class="c6"><span class="c5">VOUS RECONNAISSEZ ET ACCEPTEZ EXPRESS&Eacute;MENT QUE GOOGLE, SES SUBSIDIAIRES, SES SOCI&Eacute;T&Eacute;S AFFILI&Eacute;ES ET SES CONC&Eacute;DANTS &nbsp;NE SONT PAS RESPONSABLES ENVERS VOUS EN VERTU DE QUELQUE FORME DE RESPONSABILT&Eacute; QUI SOIT POUR TOUT DOMMAGE DIRECT, INDIRECT, ACCESSOIRE, ADDITIONNEL, CORR&Eacute;LATIF OU EXEMPLAIRE QUI POURRAIT &Ecirc;TRE SUBI PAR VOUS, INCLUANT TOUTE PERTE DE DONN&Eacute;ES, M&Ecirc;ME SI GOOGLE OU SES REPR&Eacute;SENTANTS &Eacute;TAIT INFORM&Eacute; OU AURAIT D&Ucirc; &Ecirc;TRE INFORM&Eacute; DE LA POSSIBILIT&Eacute; QUE CETTE PERTE SURVIENNE.</span></p><p class="c6"><span class="c7">Conditions d&rsquo;utilisation additionnelles pour la technologie int&eacute;gr&eacute;e</span></p><p class="c1"><span class="c7">MPEGLA</span></p><p class="c0"><span class="c8">Ce produit est AUTORIS&Eacute; en vertu de la licenCe de brevet portfolio AVC pour l&rsquo;usage personnel et non commercial d&rsquo;un consommateur pour (i) coder dU MAT&Eacute;RIEL vid&eacute;o en conformit&eacute; avec le standard AVC (&laquo;&nbsp;MAT&Eacute;RIEL Video AVC&nbsp;&raquo;) et/ou (ii) d&eacute;coder dU MAT&Eacute;RIEL video AVC qui a &eacute;t&eacute; cod&eacute; par un consommateur prenant part &agrave; une activit&eacute; personnelle et non-commerciale et/ou a &eacute;t&eacute; obtenu d&rsquo;un partenaire vid&eacute;o accr&eacute;dit&eacute; pour fournir Du mat&eacute;riel video AVC. AUCUNE LICENCE N&rsquo;EST CONC&Eacute;D&Eacute;E NI NE PEUT &Ecirc;TRE SOUS-ENTENDUE POUR TOUT AUTRE USAGE. VOUS POUVEZ OBTENIR DE L&rsquo;INFORMATION SUPPL&Eacute;MENTAIRE DE MPEG LA L.L.C. CONSULTEZ </span><span class="c2">HTTP://WWW.MPEGLA.COM.</span></p></body></html>
diff --git a/Settings/res/raw/additional_terms_of_service.html b/Settings/res/raw/additional_terms_of_service.html
deleted file mode 100644
index 0860b26..0000000
--- a/Settings/res/raw/additional_terms_of_service.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Additional Terms</title><meta content="text/html; charset=UTF-8" http-equiv="content-type"><style type="text/css">@import url('https://themes.googleusercontent.com/fonts/css?kit=m0tazYRimFnV1hoGKbgtnw');.lst-kix_list_3-8>li{counter-increment:lst-ctn-kix_list_3-8}.lst-kix_list_2-6>li{counter-increment:lst-ctn-kix_list_2-6}ol.lst-kix_list_2-0.start{counter-reset:lst-ctn-kix_list_2-0 0}.lst-kix_list_7-5>li{counter-increment:lst-ctn-kix_list_7-5}ol.lst-kix_list_6-2.start{counter-reset:lst-ctn-kix_list_6-2 0}ol.lst-kix_list_5-8.start{counter-reset:lst-ctn-kix_list_5-8 0}ol.lst-kix_list_5-3.start{counter-reset:lst-ctn-kix_list_5-3 0}.lst-kix_list_6-6>li{counter-increment:lst-ctn-kix_list_6-6}.lst-kix_list_6-3>li:before{content:"" counter(lst-ctn-kix_list_6-3,decimal) ". "}.lst-kix_list_6-7>li:before{content:"" counter(lst-ctn-kix_list_6-7,decimal) ". "}ol.lst-kix_list_1-5.start{counter-reset:lst-ctn-kix_list_1-5 0}.lst-kix_list_6-2>li:before{content:"" counter(lst-ctn-kix_list_6-2,lower-roman) ". "}.lst-kix_list_5-1>li{counter-increment:lst-ctn-kix_list_5-1}.lst-kix_list_6-3>li{counter-increment:lst-ctn-kix_list_6-3}.lst-kix_list_3-3>li{counter-increment:lst-ctn-kix_list_3-3}ol.lst-kix_list_4-2.start{counter-reset:lst-ctn-kix_list_4-2 0}ol.lst-kix_list_7-1.start{counter-reset:lst-ctn-kix_list_7-1 0}ol.lst-kix_list_2-3.start{counter-reset:lst-ctn-kix_list_2-3 0}.lst-kix_list_1-5>li{counter-increment:lst-ctn-kix_list_1-5}ol.lst-kix_list_6-4.start{counter-reset:lst-ctn-kix_list_6-4 0}.lst-kix_list_4-3>li:before{content:"" counter(lst-ctn-kix_list_4-3,decimal) ". "}ol.lst-kix_list_7-6.start{counter-reset:lst-ctn-kix_list_7-6 0}ol.lst-kix_list_3-6.start{counter-reset:lst-ctn-kix_list_3-6 0}ol.lst-kix_list_3-0.start{counter-reset:lst-ctn-kix_list_3-0 0}ol.lst-kix_list_5-0.start{counter-reset:lst-ctn-kix_list_5-0 0}.lst-kix_list_1-0>li{counter-increment:lst-ctn-kix_list_1-0}.lst-kix_list_4-4>li{counter-increment:lst-ctn-kix_list_4-4}.lst-kix_list_3-6>li:before{content:"" counter(lst-ctn-kix_list_3-6,decimal) ". "}ol.lst-kix_list_2-1.start{counter-reset:lst-ctn-kix_list_2-1 0}.lst-kix_list_4-7>li{counter-increment:lst-ctn-kix_list_4-7}.lst-kix_list_4-5>li{counter-increment:lst-ctn-kix_list_4-5}.lst-kix_list_5-2>li:before{content:"" counter(lst-ctn-kix_list_5-2,decimal) ". "}ol.lst-kix_list_2-6.start{counter-reset:lst-ctn-kix_list_2-6 0}.lst-kix_list_7-3>li{counter-increment:lst-ctn-kix_list_7-3}.lst-kix_list_6-8>li:before{content:"" counter(lst-ctn-kix_list_6-8,decimal) ". "}.lst-kix_list_3-2>li{counter-increment:lst-ctn-kix_list_3-2}.lst-kix_list_7-2>li:before{content:"" counter(lst-ctn-kix_list_7-2,lower-roman) ". "}ol.lst-kix_list_2-5.start{counter-reset:lst-ctn-kix_list_2-5 0}.lst-kix_list_7-7>li{counter-increment:lst-ctn-kix_list_7-7}ol.lst-kix_list_1-7{list-style-type:none}ol.lst-kix_list_1-8{list-style-type:none}.lst-kix_list_1-6>li:before{content:"" counter(lst-ctn-kix_list_1-6,decimal) ". "}.lst-kix_list_5-4>li{counter-increment:lst-ctn-kix_list_5-4}.lst-kix_list_4-2>li{counter-increment:lst-ctn-kix_list_4-2}.lst-kix_list_6-8>li{counter-increment:lst-ctn-kix_list_6-8}.lst-kix_list_4-1>li{counter-increment:lst-ctn-kix_list_4-1}ol.lst-kix_list_1-8.start{counter-reset:lst-ctn-kix_list_1-8 0}ol.lst-kix_list_4-3.start{counter-reset:lst-ctn-kix_list_4-3 0}ol.lst-kix_list_1-4.start{counter-reset:lst-ctn-kix_list_1-4 0}ol.lst-kix_list_1-2{list-style-type:none}ol.lst-kix_list_4-5.start{counter-reset:lst-ctn-kix_list_4-5 0}ol.lst-kix_list_1-1{list-style-type:none}.lst-kix_list_2-1>li:before{content:"" counter(lst-ctn-kix_list_2-1,lower-latin) ". "}ol.lst-kix_list_1-0{list-style-type:none}.lst-kix_list_4-8>li:before{content:"" counter(lst-ctn-kix_list_4-8,decimal) ". "}ol.lst-kix_list_1-6{list-style-type:none}.lst-kix_list_3-0>li{counter-increment:lst-ctn-kix_list_3-0}ol.lst-kix_list_1-5{list-style-type:none}.lst-kix_list_5-5>li:before{content:"" counter(lst-ctn-kix_list_5-5,decimal) ". "}ol.lst-kix_list_1-4{list-style-type:none}ol.lst-kix_list_1-3{list-style-type:none}.lst-kix_list_1-1>li{counter-increment:lst-ctn-kix_list_1-1}.lst-kix_list_6-0>li{counter-increment:lst-ctn-kix_list_6-0}.lst-kix_list_2-0>li:before{content:"" counter(lst-ctn-kix_list_2-0,decimal) ". "}ol.lst-kix_list_7-4.start{counter-reset:lst-ctn-kix_list_7-4 0}ol.lst-kix_list_1-2.start{counter-reset:lst-ctn-kix_list_1-2 0}ol.lst-kix_list_7-2.start{counter-reset:lst-ctn-kix_list_7-2 0}.lst-kix_list_5-7>li{counter-increment:lst-ctn-kix_list_5-7}.lst-kix_list_4-6>li{counter-increment:lst-ctn-kix_list_4-6}.lst-kix_list_2-4>li:before{content:"" counter(lst-ctn-kix_list_2-4,decimal) ". "}ol.lst-kix_list_4-5{list-style-type:none}ol.lst-kix_list_4-4{list-style-type:none}.lst-kix_list_4-2>li:before{content:"" counter(lst-ctn-kix_list_4-2,decimal) ". "}ol.lst-kix_list_4-7{list-style-type:none}ol.lst-kix_list_4-6{list-style-type:none}ol.lst-kix_list_4-8{list-style-type:none}ol.lst-kix_list_2-4.start{counter-reset:lst-ctn-kix_list_2-4 0}ol.lst-kix_list_1-1.start{counter-reset:lst-ctn-kix_list_1-1 0}ol.lst-kix_list_5-8{list-style-type:none}.lst-kix_list_7-4>li{counter-increment:lst-ctn-kix_list_7-4}ol.lst-kix_list_5-7{list-style-type:none}.lst-kix_list_2-1>li{counter-increment:lst-ctn-kix_list_2-1}.lst-kix_list_4-1>li:before{content:"" counter(lst-ctn-kix_list_4-1,lower-latin) ". "}ol.lst-kix_list_5-4{list-style-type:none}ol.lst-kix_list_5-3{list-style-type:none}ol.lst-kix_list_5-6{list-style-type:none}.lst-kix_list_5-2>li{counter-increment:lst-ctn-kix_list_5-2}ol.lst-kix_list_5-5{list-style-type:none}ol.lst-kix_list_1-0.start{counter-reset:lst-ctn-kix_list_1-0 0}ol.lst-kix_list_5-0{list-style-type:none}ol.lst-kix_list_5-1{list-style-type:none}.lst-kix_list_1-0>li:before{content:"" counter(lst-ctn-kix_list_1-0,decimal) ". "}ol.lst-kix_list_5-2{list-style-type:none}.lst-kix_list_2-4>li{counter-increment:lst-ctn-kix_list_2-4}.lst-kix_list_5-8>li:before{content:"" counter(lst-ctn-kix_list_5-8,decimal) ". "}.lst-kix_list_7-2>li{counter-increment:lst-ctn-kix_list_7-2}ol.lst-kix_list_1-6.start{counter-reset:lst-ctn-kix_list_1-6 0}ol.lst-kix_list_4-0{list-style-type:none}ol.lst-kix_list_4-1{list-style-type:none}ol.lst-kix_list_4-2{list-style-type:none}ol.lst-kix_list_4-3{list-style-type:none}.lst-kix_list_3-4>li:before{content:"" counter(lst-ctn-kix_list_3-4,decimal) ". "}.lst-kix_list_1-3>li:before{content:"" counter(lst-ctn-kix_list_1-3,decimal) ". "}ol.lst-kix_list_7-8.start{counter-reset:lst-ctn-kix_list_7-8 0}.lst-kix_list_5-8>li{counter-increment:lst-ctn-kix_list_5-8}ol.lst-kix_list_2-7.start{counter-reset:lst-ctn-kix_list_2-7 0}ol.lst-kix_list_7-5.start{counter-reset:lst-ctn-kix_list_7-5 0}ol.lst-kix_list_6-5.start{counter-reset:lst-ctn-kix_list_6-5 0}.lst-kix_list_6-0>li:before{content:"" counter(lst-ctn-kix_list_6-0,decimal) ". "}.lst-kix_list_1-2>li{counter-increment:lst-ctn-kix_list_1-2}.lst-kix_list_4-0>li{counter-increment:lst-ctn-kix_list_4-0}.lst-kix_list_4-0>li:before{content:"" counter(lst-ctn-kix_list_4-0,decimal) ". "}.lst-kix_list_4-8>li{counter-increment:lst-ctn-kix_list_4-8}.lst-kix_list_7-8>li:before{content:"" counter(lst-ctn-kix_list_7-8,decimal) ". "}.lst-kix_list_5-6>li{counter-increment:lst-ctn-kix_list_5-6}.lst-kix_list_3-1>li:before{content:"" counter(lst-ctn-kix_list_3-1,lower-latin) ". "}.lst-kix_list_7-1>li{counter-increment:lst-ctn-kix_list_7-1}.lst-kix_list_1-7>li:before{content:"" counter(lst-ctn-kix_list_1-7,decimal) ". "}.lst-kix_list_5-5>li{counter-increment:lst-ctn-kix_list_5-5}.lst-kix_list_3-1>li{counter-increment:lst-ctn-kix_list_3-1}.lst-kix_list_2-2>li{counter-increment:lst-ctn-kix_list_2-2}.lst-kix_list_5-1>li:before{content:"" counter(lst-ctn-kix_list_5-1,lower-latin) ". "}.lst-kix_list_7-3>li:before{content:"" counter(lst-ctn-kix_list_7-3,decimal) ". "}.lst-kix_list_1-1>li:before{content:"" counter(lst-ctn-kix_list_1-1,decimal) ". "}.lst-kix_list_3-2>li:before{content:"" counter(lst-ctn-kix_list_3-2,decimal) ". "}ol.lst-kix_list_6-3.start{counter-reset:lst-ctn-kix_list_6-3 0}ol.lst-kix_list_4-0.start{counter-reset:lst-ctn-kix_list_4-0 0}ol.lst-kix_list_4-8.start{counter-reset:lst-ctn-kix_list_4-8 0}.lst-kix_list_1-2>li:before{content:"" counter(lst-ctn-kix_list_1-2,decimal) ". "}.lst-kix_list_7-0>li{counter-increment:lst-ctn-kix_list_7-0}.lst-kix_list_2-8>li{counter-increment:lst-ctn-kix_list_2-8}.lst-kix_list_7-6>li{counter-increment:lst-ctn-kix_list_7-6}.lst-kix_list_1-5>li:before{content:"" counter(lst-ctn-kix_list_1-5,decimal) ". "}.lst-kix_list_2-3>li{counter-increment:lst-ctn-kix_list_2-3}.lst-kix_list_5-3>li{counter-increment:lst-ctn-kix_list_5-3}ol.lst-kix_list_6-0.start{counter-reset:lst-ctn-kix_list_6-0 0}ol.lst-kix_list_1-7.start{counter-reset:lst-ctn-kix_list_1-7 0}.lst-kix_list_2-3>li:before{content:"" counter(lst-ctn-kix_list_2-3,decimal) ". "}.lst-kix_list_1-4>li:before{content:"" counter(lst-ctn-kix_list_1-4,decimal) ". "}.lst-kix_list_5-7>li:before{content:"" counter(lst-ctn-kix_list_5-7,decimal) ". "}.lst-kix_list_2-0>li{counter-increment:lst-ctn-kix_list_2-0}ol.lst-kix_list_3-7.start{counter-reset:lst-ctn-kix_list_3-7 0}ol.lst-kix_list_6-7.start{counter-reset:lst-ctn-kix_list_6-7 0}.lst-kix_list_2-7>li:before{content:"" counter(lst-ctn-kix_list_2-7,decimal) ". "}.lst-kix_list_3-7>li{counter-increment:lst-ctn-kix_list_3-7}.lst-kix_list_1-8>li:before{content:"" counter(lst-ctn-kix_list_1-8,decimal) ". "}.lst-kix_list_1-6>li{counter-increment:lst-ctn-kix_list_1-6}.lst-kix_list_2-5>li{counter-increment:lst-ctn-kix_list_2-5}.lst-kix_list_3-3>li:before{content:"" counter(lst-ctn-kix_list_3-3,decimal) ". "}ol.lst-kix_list_6-1.start{counter-reset:lst-ctn-kix_list_6-1 0}ol.lst-kix_list_3-2.start{counter-reset:lst-ctn-kix_list_3-2 0}ol.lst-kix_list_1-3.start{counter-reset:lst-ctn-kix_list_1-3 0}.lst-kix_list_1-3>li{counter-increment:lst-ctn-kix_list_1-3}.lst-kix_list_6-4>li:before{content:"" counter(lst-ctn-kix_list_6-4,decimal) ". "}.lst-kix_list_2-7>li{counter-increment:lst-ctn-kix_list_2-7}.lst-kix_list_6-1>li:before{content:"" counter(lst-ctn-kix_list_6-1,lower-latin) ". "}.lst-kix_list_6-1>li{counter-increment:lst-ctn-kix_list_6-1}ol.lst-kix_list_6-8.start{counter-reset:lst-ctn-kix_list_6-8 0}.lst-kix_list_6-4>li{counter-increment:lst-ctn-kix_list_6-4}.lst-kix_list_4-7>li:before{content:"" counter(lst-ctn-kix_list_4-7,decimal) ". "}ol.lst-kix_list_5-7.start{counter-reset:lst-ctn-kix_list_5-7 0}.lst-kix_list_5-0>li{counter-increment:lst-ctn-kix_list_5-0}.lst-kix_list_6-5>li:before{content:"" counter(lst-ctn-kix_list_6-5,decimal) ". "}.lst-kix_list_2-6>li:before{content:"" counter(lst-ctn-kix_list_2-6,decimal) ". "}.lst-kix_list_3-6>li{counter-increment:lst-ctn-kix_list_3-6}ol.lst-kix_list_3-3.start{counter-reset:lst-ctn-kix_list_3-3 0}.lst-kix_list_2-2>li:before{content:"" counter(lst-ctn-kix_list_2-2,decimal) ". "}.lst-kix_list_7-7>li:before{content:"" counter(lst-ctn-kix_list_7-7,decimal) ". "}.lst-kix_list_7-1>li:before{content:"" counter(lst-ctn-kix_list_7-1,lower-latin) ". "}.lst-kix_list_1-7>li{counter-increment:lst-ctn-kix_list_1-7}ol.lst-kix_list_2-8.start{counter-reset:lst-ctn-kix_list_2-8 0}.lst-kix_list_2-8>li:before{content:"" counter(lst-ctn-kix_list_2-8,decimal) ". "}ol.lst-kix_list_2-0{list-style-type:none}ol.lst-kix_list_2-1{list-style-type:none}ol.lst-kix_list_2-2{list-style-type:none}.lst-kix_list_3-7>li:before{content:"" counter(lst-ctn-kix_list_3-7,decimal) ". "}ol.lst-kix_list_2-3{list-style-type:none}.lst-kix_list_3-4>li{counter-increment:lst-ctn-kix_list_3-4}ol.lst-kix_list_2-4{list-style-type:none}ol.lst-kix_list_2-5{list-style-type:none}ol.lst-kix_list_3-1{list-style-type:none}.lst-kix_list_6-6>li:before{content:"" counter(lst-ctn-kix_list_6-6,decimal) ". "}ol.lst-kix_list_3-2{list-style-type:none}ol.lst-kix_list_3-3{list-style-type:none}ol.lst-kix_list_3-4{list-style-type:none}ol.lst-kix_list_3-0{list-style-type:none}.lst-kix_list_1-8>li{counter-increment:lst-ctn-kix_list_1-8}ol.lst-kix_list_3-6{list-style-type:none}.lst-kix_list_7-0>li:before{content:"" counter(lst-ctn-kix_list_7-0,decimal) ". "}ol.lst-kix_list_3-5{list-style-type:none}ol.lst-kix_list_3-8{list-style-type:none}ol.lst-kix_list_3-7{list-style-type:none}ol.lst-kix_list_2-7{list-style-type:none}ol.lst-kix_list_2-6{list-style-type:none}.lst-kix_list_3-5>li:before{content:"" counter(lst-ctn-kix_list_3-5,decimal) ". "}ol.lst-kix_list_2-8{list-style-type:none}ol.lst-kix_list_7-0.start{counter-reset:lst-ctn-kix_list_7-0 0}.lst-kix_list_3-5>li{counter-increment:lst-ctn-kix_list_3-5}ol.lst-kix_list_7-7{list-style-type:none}ol.lst-kix_list_7-8{list-style-type:none}ol.lst-kix_list_5-5.start{counter-reset:lst-ctn-kix_list_5-5 0}ol.lst-kix_list_7-5{list-style-type:none}ol.lst-kix_list_7-6{list-style-type:none}ol.lst-kix_list_7-3{list-style-type:none}ol.lst-kix_list_7-7.start{counter-reset:lst-ctn-kix_list_7-7 0}ol.lst-kix_list_7-4{list-style-type:none}ol.lst-kix_list_7-1{list-style-type:none}ol.lst-kix_list_7-2{list-style-type:none}.lst-kix_list_4-6>li:before{content:"" counter(lst-ctn-kix_list_4-6,decimal) ". "}ol.lst-kix_list_6-4{list-style-type:none}ol.lst-kix_list_6-5{list-style-type:none}.lst-kix_list_5-3>li:before{content:"" counter(lst-ctn-kix_list_5-3,decimal) ". "}ol.lst-kix_list_6-2{list-style-type:none}ol.lst-kix_list_6-3{list-style-type:none}.lst-kix_list_4-5>li:before{content:"" counter(lst-ctn-kix_list_4-5,decimal) ". "}ol.lst-kix_list_6-8{list-style-type:none}ol.lst-kix_list_6-6{list-style-type:none}ol.lst-kix_list_6-7{list-style-type:none}.lst-kix_list_3-0>li:before{content:"" counter(lst-ctn-kix_list_3-0,decimal) ". "}.lst-kix_list_7-6>li:before{content:"" counter(lst-ctn-kix_list_7-6,decimal) ". "}.lst-kix_list_2-5>li:before{content:"" counter(lst-ctn-kix_list_2-5,decimal) ". "}ol.lst-kix_list_6-1{list-style-type:none}ol.lst-kix_list_6-0{list-style-type:none}ol.lst-kix_list_7-0{list-style-type:none}.lst-kix_list_5-4>li:before{content:"" counter(lst-ctn-kix_list_5-4,decimal) ". "}ol.lst-kix_list_2-2.start{counter-reset:lst-ctn-kix_list_2-2 0}.lst-kix_list_4-4>li:before{content:"" counter(lst-ctn-kix_list_4-4,decimal) ". "}ol.lst-kix_list_4-7.start{counter-reset:lst-ctn-kix_list_4-7 0}ol.lst-kix_list_6-6.start{counter-reset:lst-ctn-kix_list_6-6 0}.lst-kix_list_7-4>li:before{content:"" counter(lst-ctn-kix_list_7-4,decimal) ". "}ol.lst-kix_list_4-4.start{counter-reset:lst-ctn-kix_list_4-4 0}.lst-kix_list_4-3>li{counter-increment:lst-ctn-kix_list_4-3}.lst-kix_list_5-0>li:before{content:"" counter(lst-ctn-kix_list_5-0,decimal) ". "}.lst-kix_list_6-5>li{counter-increment:lst-ctn-kix_list_6-5}ol.lst-kix_list_4-1.start{counter-reset:lst-ctn-kix_list_4-1 0}.lst-kix_list_7-5>li:before{content:"" counter(lst-ctn-kix_list_7-5,decimal) ". "}ol.lst-kix_list_3-5.start{counter-reset:lst-ctn-kix_list_3-5 0}ol.lst-kix_list_5-6.start{counter-reset:lst-ctn-kix_list_5-6 0}.lst-kix_list_3-8>li:before{content:"" counter(lst-ctn-kix_list_3-8,decimal) ". "}.lst-kix_list_7-8>li{counter-increment:lst-ctn-kix_list_7-8}ol.lst-kix_list_3-4.start{counter-reset:lst-ctn-kix_list_3-4 0}.lst-kix_list_6-2>li{counter-increment:lst-ctn-kix_list_6-2}ol.lst-kix_list_4-6.start{counter-reset:lst-ctn-kix_list_4-6 0}ol.lst-kix_list_7-3.start{counter-reset:lst-ctn-kix_list_7-3 0}ol.lst-kix_list_5-4.start{counter-reset:lst-ctn-kix_list_5-4 0}.lst-kix_list_1-4>li{counter-increment:lst-ctn-kix_list_1-4}.lst-kix_list_5-6>li:before{content:"" counter(lst-ctn-kix_list_5-6,decimal) ". "}ol.lst-kix_list_3-8.start{counter-reset:lst-ctn-kix_list_3-8 0}ol.lst-kix_list_5-1.start{counter-reset:lst-ctn-kix_list_5-1 0}ol.lst-kix_list_3-1.start{counter-reset:lst-ctn-kix_list_3-1 0}ol.lst-kix_list_5-2.start{counter-reset:lst-ctn-kix_list_5-2 0}.lst-kix_list_6-7>li{counter-increment:lst-ctn-kix_list_6-7}ol{margin:0;padding:0}.c2{color:#222222;font-size:14pt;font-family:"Arial";font-weight:bold}.c6{color:#222222;font-size:11pt;background-color:#f9f9f9;font-family:"Arial"}.c4{font-size:13pt;font-family:"Times New Roman";font-weight:bold}.c7{color:#222222;font-size:10pt;font-family:"Arial"}.c9{max-width:432pt;background-color:#ffffff;padding:72pt 90pt 72pt 90pt}.c10{font-size:14pt;font-family:"Times New Roman";font-weight:bold}.c0{font-size:10pt;font-family:"Times New Roman"}.c3{padding-top:18pt;padding-bottom:4pt}.c8{padding-top:14pt;padding-bottom:4pt}.c1{direction:ltr}.c5{height:12pt}.title{padding-top:24pt;line-height:1.0;text-align:left;color:#000000;font-size:36pt;font-family:"Cambria";font-weight:bold;padding-bottom:6pt;page-break-after:avoid}.subtitle{padding-top:18pt;line-height:1.0;text-align:left;color:#666666;font-style:italic;font-size:24pt;font-family:"Georgia";padding-bottom:4pt;page-break-after:avoid}li{color:#000000;font-size:12pt;font-family:"Cambria"}p{color:#000000;font-size:12pt;margin:0;font-family:"Cambria"}h1{padding-top:24pt;line-height:1.0;text-align:left;color:#000000;font-size:24pt;font-family:"Cambria";font-weight:bold;padding-bottom:6pt;page-break-after:avoid}h2{padding-top:5pt;line-height:1.0;text-align:left;color:#000000;font-size:18pt;font-family:"Times New Roman";font-weight:bold;padding-bottom:5pt}h3{padding-top:5pt;line-height:1.0;text-align:left;color:#000000;font-size:13pt;font-family:"Times New Roman";font-weight:bold;padding-bottom:5pt}h4{padding-top:12pt;line-height:1.0;text-align:left;color:#000000;font-size:12pt;font-family:"Cambria";font-weight:bold;padding-bottom:2pt;page-break-after:avoid}h5{padding-top:11pt;line-height:1.0;text-align:left;color:#000000;font-size:11pt;font-family:"Cambria";font-weight:bold;padding-bottom:2pt;page-break-after:avoid}h6{padding-top:10pt;line-height:1.0;text-align:left;color:#000000;font-size:10pt;font-family:"Cambria";font-weight:bold;padding-bottom:2pt;page-break-after:avoid}</style></head><body class="c9"><p class="c1 c3"><span class="c2">Additional Terms</span></p><p class="c1"><span class="c7">Last modified: June 1, 2013</span></p><p class="c1 c5"><span class="c0"><br></span></p><p class="c1"><span class="c7">These Additional Terms supplement the Google Terms of Service, which apply when you use this developer reference device (collectively referred to as &quot;Device&quot;). For purposes of these terms, Device includes the device, operating system executable code, embedded software, firmware, fonts and other components. &nbsp;If there is any conflict between these Additional Terms and the Google Terms of Service, then these Additional Terms take precedence.</span></p><p class="c1 c5"><span class="c7"></span></p><p class="c1"><span class="c7">To the extent that the Device includes components governed by open source licenses, you can obtain information regarding those open source licenses at the following location on the Device: About -&gt; Legal Information -&gt; Open Source Licenses.</span></p><p class="c1 c5"><span class="c0"></span></p><p class="c1"><span class="c7">You may choose to use certain apps, extensions, themes, and other additions (&quot;Additions&quot;) to the Device, including some that may be pre-installed. Your use of Additions developed and provided by Google is subject to the Google Terms of Service and the Google Privacy Policy unless otherwise indicated. Your use of Additions developed and provided by third parties may be subject to third party terms of service and privacy policies.</span></p><p class="c1 c5"><span class="c0"></span></p><p class="c1"><a name="h.gjdgxs"></a><span class="c7">From time to time, Google may discover an Addition that violates the developer terms for Device or other legal agreements, laws, regulations or policies. &nbsp;The Device may periodically download a list of such Additions from Google&rsquo;s servers. You agree that Google may remotely disable or remove any such Additions from user systems in its sole discretion.</span></p><p class="c8 c1"><span class="c2">Disclaimers/Limitation of Liability</span></p><p class="c8 c1"><span class="c6">YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE DEVICE IS AT YOUR SOLE RISK AND THAT THE DEVICE IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.<br><br>YOUR USE OF THE DEVICE IS AT YOUR OWN DISCRETION AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM, TV, OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.<br><br>GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.<br><br>YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.</span></p><p class="c1 c8"><span class="c2">Incorporated Technology Additional Terms</span></p><p class="c8 c1"><span class="c2">MPEGLA</span></p><p class="c1"><span class="c7">THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD ( &quot;AVC VIDEO&quot;) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PARTNER LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM.</span></p><p class="c1 c5"><span></span></p></body></html>
diff --git a/Settings/res/values-af-notouch/strings.xml b/Settings/res/values-af-notouch/strings.xml
index c523fd9..3a6a8de 100644
--- a/Settings/res/values-af-notouch/strings.xml
+++ b/Settings/res/values-af-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"As jy \'n program dwing om te stop, kan dit dalk wangedra."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Deïnstalleer"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Wil jy hierdie program deïnstalleer?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Deaktiveer"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Wil jy hierdie program deaktiveer?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Aktiveer"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Wil jy hierdie program aktiveer?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Vee data uit"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Al hierdie program se data sal permanent uitgevee word."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Dit sluit alle lêers, instellings, rekeninge, databasisse, ens. in."</string>
diff --git a/Settings/res/values-af/strings.xml b/Settings/res/values-af/strings.xml
index 69addc7..46d441f 100644
--- a/Settings/res/values-af/strings.xml
+++ b/Settings/res/values-af/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Rugsteun en teruglaai"</string>
     <string name="device_reset" msgid="2827002349560023125">"Fabriekterugstelling"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrering"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Afgelaaide programme"</string>
     <string name="apps_system" msgid="2499191125802829425">"Stelselprogramme"</string>
     <string name="apps_running" msgid="6430310491739956228">"Programme wat aan is"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Taal"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Sleutelbord"</string>
     <string name="system_search" msgid="2837264654143247611">"Soek"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sekuriteit en beperkings"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sekuriteit en beperkings"</string>
     <string name="system_speech" msgid="8128688499687306982">"Spraak"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Invoerpunte"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Toeganklikheid"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Stelselopdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Meer oor"</string>
     <string name="device_name" msgid="2670488158531273028">"Toestelnaam"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Herbegin"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Regsinligting"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garansie"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Oopbronlisensies"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Bekyk diensbepalings"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Bekyk privaatheidsbeleid"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Bekyk bykomende bepalings"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google-regsafdeling"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Lisensiedata is nie beskikbaar nie"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Weergawe"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Tyd"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Stel datum"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Kies datumformaat"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Stel tyd"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Stel tydsone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Gebruik 24-uur-formaat"</string>
diff --git a/Settings/res/values-am-notouch/strings.xml b/Settings/res/values-am-notouch/strings.xml
index f6d976e..0c121b2 100644
--- a/Settings/res/values-am-notouch/strings.xml
+++ b/Settings/res/values-am-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"አንድ መተግበሪያ በጉልበት እንዲቆም ካደረጉ ተገቢ ያልሆነ ጸባይ ሊያሳይ ይችላል።"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"አራግፍ"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"ይሄን መተግበሪያ ማራገፍ ይፈልጋሉ?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"ያሰናክሉ"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"ይህን መተግበሪያ ማሰናከል ይፈልጋሉ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"አንቃ"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"ይህን መተግበሪያ ማንቃት ይፈልጋሉ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ውሂብ አጽዳ"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ሁሉም የዚህ መተግበሪያ ውሂብ እስከመጨረሻው ይሰረዛል።"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ይሄ ሁሉንም ፋይሎች፣ መለያዎች፣ የውሂብ ጎታዎች፣ ወዘተ. ያካትታል።"</string>
diff --git a/Settings/res/values-am/strings.xml b/Settings/res/values-am/strings.xml
index 2ec401a..feccda0 100644
--- a/Settings/res/values-am/strings.xml
+++ b/Settings/res/values-am/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ምትክ ያስቀምጡና የነበረበት ይመልሱ"</string>
     <string name="device_reset" msgid="2827002349560023125">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
     <string name="device_calibration" msgid="8632962533376605191">"መዘወግ"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"የወረዱ መተግበሪያዎች"</string>
     <string name="apps_system" msgid="2499191125802829425">"የስርዓት መተግበሪያዎች"</string>
     <string name="apps_running" msgid="6430310491739956228">"በመሄድ ላይ ያሉ መተግበሪያዎች"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"አብዛኛውን ጊዜ 0000 ወይም 1234"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"አጣምር"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"ይቅር"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google ውሰድ"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"ቀን እና ሰዓት"</string>
     <string name="system_language" msgid="2337138146114609247">"ቋንቋ"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"የቁልፍ ሰሌዳ"</string>
     <string name="system_search" msgid="2837264654143247611">"ፍለጋ"</string>
-    <string name="system_security" msgid="4190058778883258927">"ደህንነትና ገደቦች"</string>
+    <string name="system_security" msgid="8230080273993484407">"ደህንነት እና ገደቦች"</string>
     <string name="system_speech" msgid="8128688499687306982">"ንግግር"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ግብዓቶች"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ተደራሽነት"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"የስርዓት ዝማኔ"</string>
     <string name="about_preference" msgid="4131396784531360434">"ስለ"</string>
     <string name="device_name" msgid="2670488158531273028">"የመሣሪያ ስም"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"እንደገና ጀምር"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"የህግ መረጃ"</string>
     <string name="about_warranty" msgid="5736003473060436384">"ዋስትና"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"የክፍት ምንጭ ፈቃዶች"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"የአገልግሎት ውል ይመልከቱ"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"የግላዊነት መመሪያ ይመልከቱ"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"ተጨማሪ ውሎች ይመልከቱ"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google ህግ ነክ"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"የፈቃድ ውሂብ አይገኝም"</string>
     <string name="about_model" msgid="6625269442206323995">"ሞዴል"</string>
     <string name="about_version" msgid="1177287676732287266">"ሥሪት"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"ቀን"</string>
     <string name="system_time" msgid="6726022312605226285">"ጊዜ"</string>
     <string name="system_set_date" msgid="2437586307768561116">"ቀን ያዘጋጁ"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"የውሂብ ቅርፀት ምረጥ"</string>
     <string name="system_set_time" msgid="4661804115501057452">"ሰዓት ያዘጋጁ"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"የሰዓት ሰቅ ያዘጋጁ"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"የ24 ሰዓት ቅርፀት ተጠቀም"</string>
diff --git a/Settings/res/values-ar-notouch/strings.xml b/Settings/res/values-ar-notouch/strings.xml
index 2ec47c2..5b8382b 100644
--- a/Settings/res/values-ar-notouch/strings.xml
+++ b/Settings/res/values-ar-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"في حالة فرض إيقاف التطبيق، ربما لا يعمل بشكل صحيح."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"إزالة"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"هل تريد إزالة هذا التطبيق؟"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"تعطيل"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"هل تريد تعطيل هذا التطبيق؟"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"تمكين"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"هل تريد تمكين هذا التطبيق؟"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"محو البيانات"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"سيتم حذف جميع بيانات التطبيق هذه نهائيًا."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"يشمل هذا جميع الملفات والإعدادات والحسابات وقواعد البيانات، وما إلى ذلك."</string>
diff --git a/Settings/res/values-ar/strings.xml b/Settings/res/values-ar/strings.xml
index 0b88143..1ed223b 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"النسخ الاحتياطي والاستعادة"</string>
     <string name="device_reset" msgid="2827002349560023125">"إعادة الضبط بحسب بيانات المصنع"</string>
     <string name="device_calibration" msgid="8632962533376605191">"المعايرة"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"تطبيقات تم تنزيلها"</string>
     <string name="apps_system" msgid="2499191125802829425">"تطبيقات النظام"</string>
     <string name="apps_running" msgid="6430310491739956228">"تطبيقات قيد التشغيل"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"0000 أو 1234 عادة"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"إقران"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"إلغاء"</string>
-    <string name="system_cast" msgid="6421567823845207156">"إرسال Google"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"التاريخ والوقت"</string>
     <string name="system_language" msgid="2337138146114609247">"اللغة"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"لوحة المفاتيح"</string>
     <string name="system_search" msgid="2837264654143247611">"بحث"</string>
-    <string name="system_security" msgid="4190058778883258927">"الأمان والقيود"</string>
+    <string name="system_security" msgid="8230080273993484407">"الأمان والقيود"</string>
     <string name="system_speech" msgid="8128688499687306982">"الكلام"</string>
     <string name="system_inputs" msgid="2413907183796651102">"أجهزة الإدخال"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"إمكانية الوصول"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"تحديث النظام"</string>
     <string name="about_preference" msgid="4131396784531360434">"حول"</string>
     <string name="device_name" msgid="2670488158531273028">"اسم الجهاز"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"إعادة تشغيل"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"المعلومات القانونية"</string>
     <string name="about_warranty" msgid="5736003473060436384">"الضمان"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"تراخيص برامج مفتوحة مصدر"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"عرض بنود الخدمة"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"عرض سياسة الخصوصية"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"عرض البنود الإضافية"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"معلومات قانونية من Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"بيانات الترخيص غير متاحة"</string>
     <string name="about_model" msgid="6625269442206323995">"الطراز"</string>
     <string name="about_version" msgid="1177287676732287266">"الإصدار"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"التاريخ"</string>
     <string name="system_time" msgid="6726022312605226285">"الوقت"</string>
     <string name="system_set_date" msgid="2437586307768561116">"تعيين التاريخ"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"اختيار تنسيق التاريخ"</string>
     <string name="system_set_time" msgid="4661804115501057452">"تعيين الوقت"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"تعيين المنطقة الزمنية"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"استخدام تنسيق 24 ساعة"</string>
diff --git a/Settings/res/values-be-notouch/strings.xml b/Settings/res/values-be-notouch/strings.xml
index 1480453..fdb6d64 100644
--- a/Settings/res/values-be-notouch/strings.xml
+++ b/Settings/res/values-be-notouch/strings.xml
@@ -22,136 +22,56 @@
     <string name="wifi_setup_connection_success" msgid="3362351168182711828">"Паспяховае злучэнне!"</string>
     <!-- no translation found for wifi_setup_save_success (2001513015933996675) -->
     <skip />
-    <!-- no translation found for setup_ir (8305193430921797241) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_title (5476589388820014744) -->
     <skip />
-    <string name="remote_setup_welcome_message_description" msgid="2490113907172564702">"Пульт мае магчымасць кантраляваць сiлкаванне, пераключэнне ўваходаў і гук тэлевізара і прыёмнiка."</string>
-    <!-- no translation found for remote_setup_welcome_message_hint (3193005012448600181) -->
     <skip />
-    <string name="remote_setup_welcome_message_choice_yes" msgid="5685232858099010013">"Усталяваць"</string>
-    <!-- no translation found for remote_setup_welcome_message_choice_no (175673795270850846) -->
     <skip />
-    <string name="remote_setup_configuring_title" msgid="426693490088036953">"Канфiгурацыя"</string>
-    <!-- no translation found for remote_setup_tv_brand_selection_title (4426624334135525006) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_brand_not_listed (6399444939148833806) -->
     <skip />
-    <!-- no translation found for remote_setup_popular_brands (5266668021746622176) -->
     <skip />
-    <!-- no translation found for remote_setup_all_brands (4549396010551387027) -->
     <skip />
-    <string name="verify_tv_works_title" msgid="3032439000825004562">"Паспрабуйце!"</string>
-    <!-- no translation found for verify_tv_works_description (5367161763698305110) -->
     <skip />
-    <string name="verify_tv_works_title_second" msgid="385858407975452465">"А зараз?"</string>
-    <!-- no translation found for verify_tv_works_description_second (2259210492868802216) -->
     <skip />
-    <string name="remote_setup_tv_works_choice_yes" msgid="4845224377319634589">"Так, працуе"</string>
-    <string name="remote_setup_tv_works_choice_no" msgid="4592512199517822882">"Не, не працуе"</string>
-    <string name="remote_setup_tv_works_choice_exit" msgid="3284401175722431348">"Скончыць гэта потым"</string>
-    <string name="remote_setup_av_receiver_message_title" msgid="6684021872456430428">"Вы выкарыстоўваеце AV-прыёмнiк для рэгулявання гучнасці ці пераключэння крыніцы відэасігналу?"</string>
-    <string name="remote_setup_av_receiver_message_choice_yes" msgid="4425950273612887422">"Так"</string>
-    <string name="remote_setup_av_receiver_message_choice_no" msgid="4110689241054488465">"Не, проста тэлебачанне"</string>
-    <string name="av_receiver_brand_selection_title" msgid="6590559258588648873">"Якой маркі ваш AV-прыёмнiк?"</string>
-    <!-- no translation found for remote_setup_avr_brand_not_list (3844561269362712169) -->
     <skip />
-    <string name="verify_av_receiver_works_title" msgid="269543338100774333">"Паспрабуйце!"</string>
-    <!-- no translation found for verify_av_receiver_works_description (823315661416528145) -->
     <skip />
-    <string name="verify_av_receiver_works_title_second" msgid="5746428972280536169">"А зараз?"</string>
-    <!-- no translation found for verify_av_receiver_works_description_second (441544714015585905) -->
     <skip />
-    <string name="remote_setup_av_receiver_works_choice_yes" msgid="3958668567541773813">"Так, працуе"</string>
-    <!-- no translation found for remote_setup_av_receiver_works_choice_no (6425368711913498529) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_exit (643490819476900552) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_title (7922835571489412611) -->
     <skip />
-    <string name="remote_setup_complete_indicator" msgid="7561911666937200298">"✔"</string>
-    <!-- no translation found for remote_setup_complete_description (6137050944153859244) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_tv (4708077946518308016) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_avr (8656836889865354332) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_tv_and_avr (4453597584162220399) -->
     <skip />
-    <!-- no translation found for remote_setup_failure_title (5665820270966778692) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_title (167374899889584010) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_description (8659030568193419721) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_choice_continue (2978201890199080045) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_choice_try_again (883803209087217919) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_title (1569711951085807000) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_description (691671526507009571) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_choice_continue (3661278022504253254) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_choice_try_again (7093479823678687125) -->
     <skip />
-    <!-- no translation found for remote_volume_control_title (42790796387499754) -->
     <skip />
-    <!-- no translation found for remote_volume_control_description (1709266463890271158) -->
     <skip />
-    <string name="remote_volume_control_tv" msgid="8238742772961949484">"ТБ"</string>
-    <!-- no translation found for remote_volume_control_avr (1210344689909782196) -->
     <skip />
-    <string name="remote_volume_control_more_info" msgid="3974235951312948896">"Дадатковая інфармацыя"</string>
-    <!-- no translation found for remote_input_control_title (2162123799829832793) -->
     <skip />
-    <!-- no translation found for remote_input_control_description (4463232750558670880) -->
     <skip />
-    <string name="remote_input_control_tv" msgid="1161797798141087133">"ТБ"</string>
-    <!-- no translation found for remote_input_control_avr (4332681403776201898) -->
     <skip />
-    <string name="remote_input_control_more_info" msgid="2288173413092344097">"Дадатковая інфармацыя"</string>
-    <!-- no translation found for remote_power_control_title (6900887500636256080) -->
     <skip />
-    <!-- no translation found for remote_power_control_description (3169112762029996294) -->
     <skip />
-    <string name="remote_power_control_tv" msgid="20401013011107997">"ТБ"</string>
-    <!-- no translation found for remote_power_control_avr (7915107400409384444) -->
     <skip />
-    <string name="remote_power_control_more_info" msgid="6548476606481318540">"Дадатковая інфармацыя"</string>
-    <!-- no translation found for remote_setup_tv_unable_to_configure_title (4278769121940609448) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_description (8864537568753823798) -->
     <skip />
-    <string name="remote_setup_tv_unable_to_configure_hint" msgid="1731804913207624724">"Пазней гэта можна змянiць у наладах."</string>
-    <string name="remote_setup_tv_unable_to_configure_continue" msgid="3805427230334915588">"Працягваць"</string>
-    <string name="remote_setup_tv_unable_to_configure_try_again" msgid="6302613495483136852">"Паўтарыце спробу"</string>
-    <!-- no translation found for remote_setup_avr_unable_to_configure_title (7801918594788868621) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_description (1400910510206854454) -->
     <skip />
-    <string name="remote_setup_avr_unable_to_configure_hint" msgid="1160999973083806587">"Пазней гэта можна змянiць у наладах."</string>
-    <string name="remote_setup_avr_unable_to_configure_continue" msgid="6233717853267060396">"Працягваць"</string>
-    <string name="remote_setup_avr_unable_to_configure_try_again" msgid="4693947869846354939">"Паўтарыце спробу"</string>
-    <string name="remote_programmed_successfully_ok" msgid="1375513531893934307">"OК"</string>
-    <!-- no translation found for remote_summary_title_configured (5771960008601106877) -->
     <skip />
-    <!-- no translation found for remote_summary_description_configured_tv_only (7739533340195955540) -->
     <skip />
-    <!-- no translation found for remote_summary_description_configured (2021732057311118918) -->
     <skip />
-    <!-- no translation found for remote_summary_change (6976485331757187056) -->
     <skip />
-    <!-- no translation found for remote_summary_do_not_change (4097498021633504763) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_title (4030643297327885317) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_description (3511320380471211038) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_choice_continue (8780389496840477364) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_choice_start_over (1027538826869717585) -->
     <skip />
     <string name="device_apps_app_management_version" msgid="6315648665194084382">"версія <xliff:g id="APP_VERSION">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_force_stop" msgid="1803832648099079651">"Прымусовае спыненне"</string>
diff --git a/Settings/res/values-bg-notouch/strings.xml b/Settings/res/values-bg-notouch/strings.xml
index db833ab..c5746b1 100644
--- a/Settings/res/values-bg-notouch/strings.xml
+++ b/Settings/res/values-bg-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ако принудително спрете приложение, то може да не функционира правилно."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Деинсталиране"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Искате ли да деинсталирате това приложение?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Деактивиране"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Искате ли да деактивирате това приложение?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Активиране"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Искате ли да активирате това приложение?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Изчистване на данните"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Всички данни на това приложение ще бъдат изтрити за постоянно."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Това включва всички файлове, настройки, профили, бази от данни и др."</string>
diff --git a/Settings/res/values-bg/strings.xml b/Settings/res/values-bg/strings.xml
index 174af40..f49b298 100644
--- a/Settings/res/values-bg/strings.xml
+++ b/Settings/res/values-bg/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Резервни копия и възстановяване"</string>
     <string name="device_reset" msgid="2827002349560023125">"Възстановяване на фабр. настройки"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калибриране"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Изтеглени приложения"</string>
     <string name="apps_system" msgid="2499191125802829425">"Системни приложения"</string>
     <string name="apps_running" msgid="6430310491739956228">"Изпълнявани приложения"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Език"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Клавиатура"</string>
     <string name="system_search" msgid="2837264654143247611">"Търсене"</string>
-    <string name="system_security" msgid="4190058778883258927">"Сигурност и ограничения"</string>
+    <string name="system_security" msgid="8230080273993484407">"Сигурност и ограничения"</string>
     <string name="system_speech" msgid="8128688499687306982">"Говор"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Входове"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Достъпност"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Системна актуализация"</string>
     <string name="about_preference" msgid="4131396784531360434">"Информация"</string>
     <string name="device_name" msgid="2670488158531273028">"Име на устройството"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Рестартиране"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Правна информация"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Гаранция"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Лицензи за отворен код"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Преглед на Общите условия"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Преглед на Декл. за поверит."</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Преглед на Допълнителните условия"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google – правен текст"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Данните за лиценза не са налице"</string>
     <string name="about_model" msgid="6625269442206323995">"Модел"</string>
     <string name="about_version" msgid="1177287676732287266">"Версия"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Дата"</string>
     <string name="system_time" msgid="6726022312605226285">"Час"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Задаване на датата"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Избор на формат на датата"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Задаване на час"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Задаване на часовата зона"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Да се използва 24-часов формат"</string>
diff --git a/Settings/res/values-bn-rBD-notouch/strings.xml b/Settings/res/values-bn-rBD-notouch/strings.xml
index a73fe9e..e7a78e2 100644
--- a/Settings/res/values-bn-rBD-notouch/strings.xml
+++ b/Settings/res/values-bn-rBD-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"আপনি কোনো অ্যাপ্লিকেশানকে জোর করে বন্ধ করলে, তা অস্বাভাবিক ব্যবহার করতে পারে।"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"আনইনস্টল করুন"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"আপনি কি এই অ্যাপ্লিকেশানটিকে আনইনস্টল করতে চান?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"অক্ষম করুন"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"আপনি কি এই অ্যাপ্লিকেশানটিকে অক্ষম করতে চান?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"সক্রিয় করুন"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"আপনি কি এই অ্যাপ্লিকেশানটিকে সক্রিয় করতে চান?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ডেটা সাফ করুন"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"এই অ্যাপ্লিকেশানের সব ডেটা স্থায়ীভাবে মুছে ফেলা হবে।"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"এর মধ্যে সব ফাইল, সেটিংস, অ্যাকাউন্ট, ডেটাবেস ইত্যাদি অন্তর্ভুক্ত।"</string>
diff --git a/Settings/res/values-bn-rBD/strings.xml b/Settings/res/values-bn-rBD/strings.xml
index 6667682..b2ba5b6 100644
--- a/Settings/res/values-bn-rBD/strings.xml
+++ b/Settings/res/values-bn-rBD/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ব্যাকআপ ও পুনরুদ্ধার"</string>
     <string name="device_reset" msgid="2827002349560023125">"ফ্যাক্টরি ডেটা পুনঃসেট"</string>
     <string name="device_calibration" msgid="8632962533376605191">"ক্রমাঙ্কন"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</string>
     <string name="apps_system" msgid="2499191125802829425">"সিস্টেম অ্যাপ্লিকেশানগুলি"</string>
     <string name="apps_running" msgid="6430310491739956228">"চলতে থাকা অ্যাপ্লিকেশানগুলি"</string>
@@ -74,7 +78,7 @@
     <string name="accessory_unpair" msgid="8242725516604465355">"বিযুক্ত করুন"</string>
     <string name="accessory_unpairing" msgid="7568241162181184667">"ডিভাইস বিযুক্ত করা হচ্ছে..."</string>
     <string name="accessory_connected" msgid="2156489304110030393">"সংযুক্ত হয়েছে"</string>
-    <string name="accessories_add_title" msgid="6940361421891873321">"আনুষঙ্গিক উপকরণের জন্য অনুসন্ধান করছে..."</string>
+    <string name="accessories_add_title" msgid="6940361421891873321">"অন্য উপকরণ খুঁজছে..."</string>
     <string name="accessories_add_bluetooth_inst" msgid="5892952745770640383">"আপনার Bluetooth ডিভাইসগুলি যুক্ত করার আগে, সেগুলি যুক্ত করার মোডে রয়েছে কিনা তা নিশ্চিত করুন"</string>
     <string name="accessories_autopair_msg" msgid="8618829246837821752">"একটি ডিভাইস পাওয়া গেছে এবং <xliff:g id="COUNTDOWN">%1$s</xliff:g> সেকেন্ডের মধ্যে স্বয়ংক্রিয়ভাবে যুক্ত হবে"</string>
     <string name="accessories_add_title_multiple" msgid="8455249961819802466">"একাধিক ডিভাইস পাওয়া গেছে"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"সাধারণত ০০০০ বা ১২৩৪"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"যুক্ত করুন"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"বাতিল করুন"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google কাস্ট"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"দিন ও তারিখ"</string>
     <string name="system_language" msgid="2337138146114609247">"ভাষা"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"কীবোর্ড"</string>
     <string name="system_search" msgid="2837264654143247611">"অনুসন্ধান করুন"</string>
-    <string name="system_security" msgid="4190058778883258927">"নিরাপত্তা &amp; বিধিনিষেধ"</string>
+    <string name="system_security" msgid="8230080273993484407">"নিরাপত্তা ও সীমাবদ্ধতাগুলি"</string>
     <string name="system_speech" msgid="8128688499687306982">"কথন"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ইনপুট"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"অ্যাক্সেসযোগ্যতা"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"সিস্টেম আপডেট"</string>
     <string name="about_preference" msgid="4131396784531360434">"সম্পর্কে"</string>
     <string name="device_name" msgid="2670488158531273028">"ডিভাইস নাম"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"আবার শুরু করুন"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"আইনি তথ্য"</string>
     <string name="about_warranty" msgid="5736003473060436384">"ওয়্যারেন্টি"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"মুক্ত উৎস লাইসেন্সগুলি"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"পরিষেবার শর্তাবলি দেখুন"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"গোপনীয়তা নীতি দেখুন"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"অতিরিক্ত শর্তাবলী দেখুন"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google আইনি"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"লাইসেন্স ডেটা অনুপলব্ধ"</string>
     <string name="about_model" msgid="6625269442206323995">"মডেল"</string>
     <string name="about_version" msgid="1177287676732287266">"সংস্করণ"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"তারিখ"</string>
     <string name="system_time" msgid="6726022312605226285">"সময়"</string>
     <string name="system_set_date" msgid="2437586307768561116">"তারিখ সেট করুন"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"তারিখের ফর্ম্যাট চয়ন করুন"</string>
     <string name="system_set_time" msgid="4661804115501057452">"সময় সেট করুন"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"সময় অঞ্চল সেট করুন"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"২৪ ঘন্টার ফর্ম্যাট ব্যবহার করুন"</string>
diff --git a/Settings/res/values-ca-notouch/strings.xml b/Settings/res/values-ca-notouch/strings.xml
index 5f1bdc9..dc9871e 100644
--- a/Settings/res/values-ca-notouch/strings.xml
+++ b/Settings/res/values-ca-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Si forces l\'aturada d\'una aplicació, és possible que no funcioni correctament."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstal·la"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Vols desinstal·lar aquesta aplicació?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Desactiva"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Vols desactivar l\'aplicació?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Activa"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Vols activar l\'aplicació?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Esborra les dades"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Totes les dades d\'aquesta aplicació se suprimiran permanentment."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Això inclou tots els fitxers, els paràmetres, els comptes, les bases de dades, etc."</string>
diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index 5fefe19..503b932 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Còpia de seguretat i restauració"</string>
     <string name="device_reset" msgid="2827002349560023125">"Restableix les dades de fàbrica"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibratge"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplicacions baixades"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplicacions del sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplicacions en funcionament"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Idioma"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teclat"</string>
     <string name="system_search" msgid="2837264654143247611">"Cerca"</string>
-    <string name="system_security" msgid="4190058778883258927">"Seguretat i restriccions"</string>
+    <string name="system_security" msgid="8230080273993484407">"Seguretat i restriccions"</string>
     <string name="system_speech" msgid="8128688499687306982">"Veu"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entrades"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilitat"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Actualització del sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Quant a"</string>
     <string name="device_name" msgid="2670488158531273028">"Nom del dispositiu"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reinicia"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informació legal"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantia"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Llicències de codi obert"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Mostra les Condicions del servei"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Mostra la política de privadesa"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Mostra les Condicions addicionals"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Informació legal de Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Les dades sobre llicències no estan disponibles"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Versió"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Hora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Estableix la data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Format de data"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Estableix l\'hora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Estableix la zona horària"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Utilitza el format de 24 hores"</string>
diff --git a/Settings/res/values-cs-notouch/strings.xml b/Settings/res/values-cs-notouch/strings.xml
index e8f8b0d..b1f3429 100644
--- a/Settings/res/values-cs-notouch/strings.xml
+++ b/Settings/res/values-cs-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Vynucené zastavení může způsobit nepředvídatelné chování aplikace."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Odinstalovat"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Chcete tuto aplikaci odinstalovat?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Vypnout"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Opravdu tuto aplikaci chcete vypnout?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Zapnout"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Chcete tuto aplikaci zapnout?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Vymazat data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Všechna data této aplikace budou trvale vymazána."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Vymazány budou všechny soubory, nastavení, účty, databáze apod."</string>
diff --git a/Settings/res/values-cs/arrays.xml b/Settings/res/values-cs/arrays.xml
index 9e3b365..a3b6c74 100644
--- a/Settings/res/values-cs/arrays.xml
+++ b/Settings/res/values-cs/arrays.xml
@@ -21,7 +21,7 @@
     <item msgid="5210943529756743284">"Vyhledávání…"</item>
     <item msgid="7895190850044173217">"Připojování…"</item>
     <item msgid="7589307602609991992">"Ověřování…"</item>
-    <item msgid="7439429469102224627">"Načítání adresy IP…"</item>
+    <item msgid="7439429469102224627">"Načítání IP adresy…"</item>
     <item msgid="7079865889809010740">"Připojeno"</item>
     <item msgid="8018480471737227053">"Pozastaveno"</item>
     <item msgid="9110004131358099530">"Odpojování…"</item>
@@ -35,7 +35,7 @@
     <item msgid="4703591207522320165">"Vyhledávání…"</item>
     <item msgid="7351421574703844779">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="874502389678205660">"Ověřování v síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
-    <item msgid="7964187733783647040">"Získávání adresy IP ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7964187733783647040">"Získávání IP adresy ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="4990222034464002805">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="5347651564202902346">"Pozastaveno"</item>
     <item msgid="4812777464932254477">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
diff --git a/Settings/res/values-cs/strings.xml b/Settings/res/values-cs/strings.xml
index 02fb843..6fc609a 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Záloha a obnovení"</string>
     <string name="device_reset" msgid="2827002349560023125">"Obnovení továrních dat"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrace"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Stažené aplikace"</string>
     <string name="apps_system" msgid="2499191125802829425">"Systémové aplikace"</string>
     <string name="apps_running" msgid="6430310491739956228">"Spuštěné aplikace"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Jazyk"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Klávesnice"</string>
     <string name="system_search" msgid="2837264654143247611">"Vyhledávání"</string>
-    <string name="system_security" msgid="4190058778883258927">"Zabezpečení a omezení"</string>
+    <string name="system_security" msgid="8230080273993484407">"Zabezpečení a omezení"</string>
     <string name="system_speech" msgid="8128688499687306982">"Řeč"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Vstupy"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Usnadnění"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Aktualizace systému"</string>
     <string name="about_preference" msgid="4131396784531360434">"O zařízení"</string>
     <string name="device_name" msgid="2670488158531273028">"Název zařízení"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Restartovat"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Právní informace"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Záruka"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licence open source"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Zobrazit smluvní podmínky"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Zobrazit zásady ochrany soukromí"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Zobrazit dodatečné smluvní podmínky"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Právní informace společnosti Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Údaje o licenci jsou nedostupné."</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Verze"</string>
@@ -226,7 +229,7 @@
     <string name="wifi_summary_unknown_network" msgid="7903601448928422642">"neznámá síť"</string>
     <string name="connectivity_advanced_options" msgid="2858199826425132228">"Rozšířené možnosti"</string>
     <string name="connectivity_advanced_options_description" msgid="370129113175689226">"<xliff:g id="SSID_0">%1$s</xliff:g>, <xliff:g id="SSID_1">%2$s</xliff:g>"</string>
-    <string name="title_ip_settings" msgid="6408399523925189065">"Nastavení adresy IP"</string>
+    <string name="title_ip_settings" msgid="6408399523925189065">"Nastavení IP adresy"</string>
     <string name="title_test_connection" msgid="1202798409060082670">"Otestovat připojení"</string>
     <string name="dhcp" msgid="5536822848499568335">"DHCP"</string>
     <string name="title_static" msgid="6690544371649264526">"Statická"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Čas"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Nastavení data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Vybrat formát data"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Nastavení času"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Nastavení časového pásma"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Použít 24hodinový formát"</string>
diff --git a/Settings/res/values-da-notouch/strings.xml b/Settings/res/values-da-notouch/strings.xml
index 008c5c5..6bdbe58 100644
--- a/Settings/res/values-da-notouch/strings.xml
+++ b/Settings/res/values-da-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Hvis du tvinger en app til at standse, kan det medføre, at den ikke fungerer korrekt."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Afinstaller"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Vil du afinstallere denne app?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Deaktiver"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Vil du deaktivere denne app?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Aktivér"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Vil du aktivere denne app?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Ryd data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Alle denne apps data vil blive slettet permanent."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Dette omfatter alle filer, indstillinger, konti, databaser osv."</string>
diff --git a/Settings/res/values-da/arrays.xml b/Settings/res/values-da/arrays.xml
index 7f2ebf2..161e239 100644
--- a/Settings/res/values-da/arrays.xml
+++ b/Settings/res/values-da/arrays.xml
@@ -75,7 +75,7 @@
     <item msgid="2707402752636362906">"Sans-serif, enkelt tegnafstand"</item>
     <item msgid="4549910217342216388">"Serif"</item>
     <item msgid="4764344884232052861">"Serif, enkelt tegnafstand"</item>
-    <item msgid="8561996903323025702">"Casual"</item>
+    <item msgid="8561996903323025702">"Uformel"</item>
     <item msgid="8403638572764467550">"Kursiv"</item>
     <item msgid="5560655268137500927">"Små versaler"</item>
   </string-array>
diff --git a/Settings/res/values-da/strings.xml b/Settings/res/values-da/strings.xml
index 769baec..40148a5 100644
--- a/Settings/res/values-da/strings.xml
+++ b/Settings/res/values-da/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sikkerhedskopiering og gendannelse"</string>
     <string name="device_reset" msgid="2827002349560023125">"Nulstilling af fabriksdata"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrering"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Downloadede apps"</string>
     <string name="apps_system" msgid="2499191125802829425">"Systemapps"</string>
     <string name="apps_running" msgid="6430310491739956228">"Kørende apps"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Sprog"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tastatur"</string>
     <string name="system_search" msgid="2837264654143247611">"Søgning"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sikkerhed og begrænsninger"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sikkerhed og begrænsninger"</string>
     <string name="system_speech" msgid="8128688499687306982">"Tale"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Indgange"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Hjælpefunktioner"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Systemopdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Om"</string>
     <string name="device_name" msgid="2670488158531273028">"Enhedens navn"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Genstart"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Juridiske oplysninger"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garanti"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Open source-licenser"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Se Servicevilkår"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Se Privatlivspolitik"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Se Yderligere vilkår"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Juridisk information fra Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licensdataene er utilgængelige"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Dato"</string>
     <string name="system_time" msgid="6726022312605226285">"Tid"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Angiv dato"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Vælg datoformat"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Angiv tid"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Angiv tidszone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Brug 24-timers format"</string>
@@ -332,7 +334,7 @@
     <string name="system_accessibility_service_on_confirm_desc" msgid="1102358356500113060">"<xliff:g id="SERVICE">%1$s</xliff:g> kan indsamle al den tekst, du skriver, undtagen adgangskoder. Dette omfatter personlige data såsom kreditkortnumre."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="963297812889694832">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="6714782635926048678">"Hvis du vælger OK, stoppes <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
-    <string name="system_accessibility_tts_output" msgid="8905477795536714590">"Tekst til tale"</string>
+    <string name="system_accessibility_tts_output" msgid="8905477795536714590">"Oplæsning"</string>
     <string name="system_speak_passwords" msgid="5264650214879185873">"Oplæs adgangskoder"</string>
     <string name="system_preferred_engine" msgid="8258210139854655567">"Foretrukken maskine"</string>
     <string name="system_speech_rate" msgid="8099856582088545576">"Talehastighed"</string>
diff --git a/Settings/res/values-de-notouch/strings.xml b/Settings/res/values-de-notouch/strings.xml
index c2078b1..3f9a34d 100644
--- a/Settings/res/values-de-notouch/strings.xml
+++ b/Settings/res/values-de-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Das Beenden der App zu erzwingen kann zu unerwünschtem Verhalten führen."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Deinstallieren"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Möchten Sie diese App deinstallieren?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Deaktivieren"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Möchten Sie diese App deaktivieren?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Aktivieren"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Möchten Sie diese App aktivieren?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Daten löschen"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Sämtliche Daten dieser App werden unwiderruflich gelöscht."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Dazu gehören alle Dateien, Einstellungen, Konten, Datenbanken usw."</string>
diff --git a/Settings/res/values-de/strings.xml b/Settings/res/values-de/strings.xml
index 3b5bc17..87dd016 100644
--- a/Settings/res/values-de/strings.xml
+++ b/Settings/res/values-de/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sicherung &amp; Wiederherstellung"</string>
     <string name="device_reset" msgid="2827002349560023125">"Auf Werkszustand zurück"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrierung"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Heruntergeladene Apps"</string>
     <string name="apps_system" msgid="2499191125802829425">"System-Apps"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aktive Apps"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Sprache"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tastatur"</string>
     <string name="system_search" msgid="2837264654143247611">"Suche"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sicherheit &amp; Einschränkungen"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sicherheit &amp; Einschränkungen"</string>
     <string name="system_speech" msgid="8128688499687306982">"Spracherkennung"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Eingänge"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Bedienungshilfen"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"System aktualisieren"</string>
     <string name="about_preference" msgid="4131396784531360434">"Info"</string>
     <string name="device_name" msgid="2670488158531273028">"Gerätename"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Neu starten"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Rechtliche Hinweise"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantie"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Open-Source-Lizenzen"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Nutzungsbedingungen ansehen"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Datenschutzerklärung ansehen"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Zusätzliche Bestimmungen ansehen"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Rechtliche Hinweise"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Lizenzdaten sind nicht verfügbar."</string>
     <string name="about_model" msgid="6625269442206323995">"Modell"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Uhrzeit"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Datum festlegen"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Datumsformat auswählen"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Uhrzeit festlegen"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Zeitzone festlegen"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-Stunden-Format"</string>
diff --git a/Settings/res/values-el-notouch/strings.xml b/Settings/res/values-el-notouch/strings.xml
index 6aa0b9a..f81c2d5 100644
--- a/Settings/res/values-el-notouch/strings.xml
+++ b/Settings/res/values-el-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Αν επιβάλετε τη διακοπή μιας εφαρμογής, ενδέχεται να μη λειτουργήσει σωστά."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Κατάργηση εγκατάστασης"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Θέλετε να καταργήσετε την εγκατάσταση αυτής της εφαρμογής;"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Απενεργοποίηση"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Θέλετε να απενεργοποιήσετε αυτήν την εφαρμογή;"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Ενεργοποίηση"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Θέλετε να ενεργοποιήσετε αυτήν την εφαρμογή;"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Εκκαθάριση δεδομένων"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Όλα τα δεδομένα αυτής της εφαρμογής θα διαγραφούν οριστικά."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Σε αυτά περιλαμβάνονται όλα τα αρχεία, οι ρυθμίσεις, οι λογαριασμοί, οι βάσεις δεδομένων, κ.λπ."</string>
diff --git a/Settings/res/values-el/strings.xml b/Settings/res/values-el/strings.xml
index 83d8f49..fe21a7a 100644
--- a/Settings/res/values-el/strings.xml
+++ b/Settings/res/values-el/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Δημιουργία αντιγράφου ασφαλείας και επαναφορά"</string>
     <string name="device_reset" msgid="2827002349560023125">"Επαναφορά δεδομένων"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Βαθμονόμηση"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Ληφθείσες εφαρμογές"</string>
     <string name="apps_system" msgid="2499191125802829425">"Εφαρμογές συστήματος"</string>
     <string name="apps_running" msgid="6430310491739956228">"Εκτελούμενες εφαρμογές"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Γλώσσα"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Πληκτρολόγιο"</string>
     <string name="system_search" msgid="2837264654143247611">"Αναζήτηση"</string>
-    <string name="system_security" msgid="4190058778883258927">"Ασφάλεια και περιορισμοί"</string>
+    <string name="system_security" msgid="8230080273993484407">"Ασφάλεια και περιορισμοί"</string>
     <string name="system_speech" msgid="8128688499687306982">"Ομιλία"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Είσοδοι"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Προσβα/τητα"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Ενημέρωση συστήματος"</string>
     <string name="about_preference" msgid="4131396784531360434">"Πληροφορίες"</string>
     <string name="device_name" msgid="2670488158531273028">"Όνομα συσκευής"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Επανεκκίνηση"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Νομικές πληροφορίες"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Εγγύηση"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Άδειες λογισμικού ανοικτού κώδικα"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Προβολή Όρων Παροχής Υπηρεσιών"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Προβολή Πολιτικής Απορρήτου"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Προβολή Πρόσθετων Όρων"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Νομικές πληροφορίες Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Τα δεδομένα άδειας δεν είναι διαθέσιμα"</string>
     <string name="about_model" msgid="6625269442206323995">"Μοντέλο"</string>
     <string name="about_version" msgid="1177287676732287266">"Έκδοση"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Ημερομηνία"</string>
     <string name="system_time" msgid="6726022312605226285">"Ώρα"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Ορισμός ημερομηνίας"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Επιλογή μορφής ημερομηνίας"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Ρύθμιση ώρας"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Oρισμός ζώνης ώρας"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Χρήση μορφής 24ώρου"</string>
diff --git a/Settings/res/values-en-rAU-notouch/strings.xml b/Settings/res/values-en-rAU-notouch/strings.xml
index d43bec3..0ea7c40 100644
--- a/Settings/res/values-en-rAU-notouch/strings.xml
+++ b/Settings/res/values-en-rAU-notouch/strings.xml
@@ -26,6 +26,14 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"If you force stop an app, it may misbehave."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Uninstall"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Do you want to uninstall this app?"</string>
+    <!-- no translation found for device_apps_app_management_disable (1461984395121717076) -->
+    <skip />
+    <!-- no translation found for device_apps_app_management_disable_desc (1362228583828208991) -->
+    <skip />
+    <!-- no translation found for device_apps_app_management_enable (8794752872502256633) -->
+    <skip />
+    <!-- no translation found for device_apps_app_management_enable_desc (6449017972628203288) -->
+    <skip />
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Clear data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"All this app’s data will be deleted permanently."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"This includes all files, settings, accounts, databases etc."</string>
diff --git a/Settings/res/values-en-rAU/strings.xml b/Settings/res/values-en-rAU/strings.xml
index 495ed75..4839cb1 100644
--- a/Settings/res/values-en-rAU/strings.xml
+++ b/Settings/res/values-en-rAU/strings.xml
@@ -63,6 +63,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Backup &amp; restore"</string>
     <string name="device_reset" msgid="2827002349560023125">"Factory data reset"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibration"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Downloaded apps"</string>
     <string name="apps_system" msgid="2499191125802829425">"System app"</string>
     <string name="apps_running" msgid="6430310491739956228">"Running apps"</string>
@@ -107,7 +111,7 @@
     <string name="system_language" msgid="2337138146114609247">"Language"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Keyboard"</string>
     <string name="system_search" msgid="2837264654143247611">"Search"</string>
-    <!-- no translation found for system_security (4190058778883258927) -->
+    <!-- no translation found for system_security (8230080273993484407) -->
     <skip />
     <string name="system_speech" msgid="8128688499687306982">"Speech"</string>
     <!-- no translation found for system_inputs (2413907183796651102) -->
@@ -119,12 +123,13 @@
     <string name="about_system_update" msgid="7282772247661356586">"System update"</string>
     <string name="about_preference" msgid="4131396784531360434">"About"</string>
     <string name="device_name" msgid="2670488158531273028">"Device name"</string>
+    <!-- no translation found for restart_button_label (8153112858638352970) -->
+    <skip />
     <string name="about_legal_info" msgid="8511870741437307531">"Legal information"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Warranty"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Open-source licences"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"View Terms of Service"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"View Privacy Policy"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"View Additional Terms"</string>
+    <!-- no translation found for about_terms_of_service (7743088207977334874) -->
+    <skip />
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licence data is unavailable"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -303,7 +308,6 @@
     <string name="system_date" msgid="2767108116769558081">"Date"</string>
     <string name="system_time" msgid="6726022312605226285">"Time"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Set date"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Choose date format"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Set time"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Set time zone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Use 24-hour format"</string>
diff --git a/Settings/res/values-en-rGB-notouch/strings.xml b/Settings/res/values-en-rGB-notouch/strings.xml
index 234773d..813b77b 100644
--- a/Settings/res/values-en-rGB-notouch/strings.xml
+++ b/Settings/res/values-en-rGB-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"If you force stop an app, it may misbehave."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Uninstall"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Do you want to uninstall this app?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Disable"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Do you want to disable this app?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Enable"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Do you want to enable this app?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Clear data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"All this app’s data will be deleted permanently."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"This includes all files, settings, accounts, databases, etc."</string>
diff --git a/Settings/res/values-en-rGB/strings.xml b/Settings/res/values-en-rGB/strings.xml
index cdbe604..ed8260a 100644
--- a/Settings/res/values-en-rGB/strings.xml
+++ b/Settings/res/values-en-rGB/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Backup &amp; restore"</string>
     <string name="device_reset" msgid="2827002349560023125">"Factory data reset"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibration"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Downloaded apps"</string>
     <string name="apps_system" msgid="2499191125802829425">"System app"</string>
     <string name="apps_running" msgid="6430310491739956228">"Running apps"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Language"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Keyboard"</string>
     <string name="system_search" msgid="2837264654143247611">"Search"</string>
-    <string name="system_security" msgid="4190058778883258927">"Security &amp; restrictions"</string>
+    <string name="system_security" msgid="8230080273993484407">"Security &amp; restrictions"</string>
     <string name="system_speech" msgid="8128688499687306982">"Speech"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Inputs"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"System update"</string>
     <string name="about_preference" msgid="4131396784531360434">"About"</string>
     <string name="device_name" msgid="2670488158531273028">"Device name"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Restart"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Legal information"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Warranty"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Open-source licences"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"View Terms of Service"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"View Privacy Policy"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"View Additional Terms"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licence data is unavailable"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Date"</string>
     <string name="system_time" msgid="6726022312605226285">"Time"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Set date"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Choose date format"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Set time"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Set time zone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Use 24-hour format"</string>
diff --git a/Settings/res/values-en-rIN-notouch/strings.xml b/Settings/res/values-en-rIN-notouch/strings.xml
index 234773d..813b77b 100644
--- a/Settings/res/values-en-rIN-notouch/strings.xml
+++ b/Settings/res/values-en-rIN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"If you force stop an app, it may misbehave."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Uninstall"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Do you want to uninstall this app?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Disable"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Do you want to disable this app?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Enable"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Do you want to enable this app?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Clear data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"All this app’s data will be deleted permanently."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"This includes all files, settings, accounts, databases, etc."</string>
diff --git a/Settings/res/values-en-rIN/strings.xml b/Settings/res/values-en-rIN/strings.xml
index cdbe604..ed8260a 100644
--- a/Settings/res/values-en-rIN/strings.xml
+++ b/Settings/res/values-en-rIN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Backup &amp; restore"</string>
     <string name="device_reset" msgid="2827002349560023125">"Factory data reset"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibration"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Downloaded apps"</string>
     <string name="apps_system" msgid="2499191125802829425">"System app"</string>
     <string name="apps_running" msgid="6430310491739956228">"Running apps"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Language"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Keyboard"</string>
     <string name="system_search" msgid="2837264654143247611">"Search"</string>
-    <string name="system_security" msgid="4190058778883258927">"Security &amp; restrictions"</string>
+    <string name="system_security" msgid="8230080273993484407">"Security &amp; restrictions"</string>
     <string name="system_speech" msgid="8128688499687306982">"Speech"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Inputs"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"System update"</string>
     <string name="about_preference" msgid="4131396784531360434">"About"</string>
     <string name="device_name" msgid="2670488158531273028">"Device name"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Restart"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Legal information"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Warranty"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Open-source licences"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"View Terms of Service"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"View Privacy Policy"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"View Additional Terms"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licence data is unavailable"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Date"</string>
     <string name="system_time" msgid="6726022312605226285">"Time"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Set date"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Choose date format"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Set time"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Set time zone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Use 24-hour format"</string>
diff --git a/Settings/res/values-es-notouch/strings.xml b/Settings/res/values-es-notouch/strings.xml
index 57d05b7..a331165 100644
--- a/Settings/res/values-es-notouch/strings.xml
+++ b/Settings/res/values-es-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Si se detiene una aplicación, es posible que no funcione correctamente."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalar aplicaciones"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"¿Quieres desinstalar esta aplicación?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Inhabilitar"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"¿Quieres inhabilitar esta aplicación?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Habilitar"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"¿Quieres habilitar esta aplicación?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Borrar datos"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Todos los datos de esta aplicación se eliminarán de forma permanente."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Se incluyen todos los archivos, opciones de configuración, cuentas, bases de datos, etc."</string>
diff --git a/Settings/res/values-es-rUS-notouch/strings.xml b/Settings/res/values-es-rUS-notouch/strings.xml
index 5f3a202..297ada2 100644
--- a/Settings/res/values-es-rUS-notouch/strings.xml
+++ b/Settings/res/values-es-rUS-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Si fuerzas la detención de una aplicación, es posible que esta no funcione correctamente."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalar"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"¿Quieres desinstalar esta aplicación?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Inhabilitar"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"¿Quieres inhabilitar esta aplicación?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Habilitar"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"¿Quieres habilitar esta aplicación?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Borrar datos"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Todos los datos de esta aplicación se eliminarán de forma permanente."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Esto incluye todos los archivos, configuraciones, cuentas, bases de datos, etc."</string>
diff --git a/Settings/res/values-es-rUS/strings.xml b/Settings/res/values-es-rUS/strings.xml
index f2030a4..3d8124e 100644
--- a/Settings/res/values-es-rUS/strings.xml
+++ b/Settings/res/values-es-rUS/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Crear copia de seguridad y Restablecer"</string>
     <string name="device_reset" msgid="2827002349560023125">"Restablecer config. de fábrica"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibración"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplicaciones descargadas"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplicaciones del sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplicaciones en ejecución"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Idioma"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teclado"</string>
     <string name="system_search" msgid="2837264654143247611">"Búsqueda"</string>
-    <string name="system_security" msgid="4190058778883258927">"Seguridad y restricciones"</string>
+    <string name="system_security" msgid="8230080273993484407">"Seguridad y restricciones"</string>
     <string name="system_speech" msgid="8128688499687306982">"Voz"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entradas"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilidad"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Actualización del sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Acerca de"</string>
     <string name="device_name" msgid="2670488158531273028">"Nombre del dispositivo"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reiniciar"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Información legal"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantía"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licencias de código abierto"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Ver Condiciones del servicio"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Ver Política de privacidad"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ver Condiciones adicionales"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Avisos legales de Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Los datos de licencia no están disponibles."</string>
     <string name="about_model" msgid="6625269442206323995">"Modelo"</string>
     <string name="about_version" msgid="1177287676732287266">"Versión"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Fecha"</string>
     <string name="system_time" msgid="6726022312605226285">"Hora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Establecer fecha"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Elegir el formato de fecha"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Establecer hora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Establecer zona horaria"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Usar formato de 24 horas"</string>
diff --git a/Settings/res/values-es/strings.xml b/Settings/res/values-es/strings.xml
index a8c8733..4ab2634 100644
--- a/Settings/res/values-es/strings.xml
+++ b/Settings/res/values-es/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Copia de seguridad y restauración"</string>
     <string name="device_reset" msgid="2827002349560023125">"Restablecer datos de fábrica"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibración"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplicaciones descargadas"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplicaciones del sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplicaciones en ejecución"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Idioma"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teclado"</string>
     <string name="system_search" msgid="2837264654143247611">"Búsqueda"</string>
-    <string name="system_security" msgid="4190058778883258927">"Seguridad y restricciones"</string>
+    <string name="system_security" msgid="8230080273993484407">"Seguridad y restricciones"</string>
     <string name="system_speech" msgid="8128688499687306982">"Voz"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entradas"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilidad"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Actualización del sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Información"</string>
     <string name="device_name" msgid="2670488158531273028">"Nombre del dispositivo"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reiniciar"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Información legal"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantía"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licencias de código abierto"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Ver Condiciones de servicio"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Ver Política de privacidad"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ver Condiciones adicionales"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Condiciones legales de Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Los datos de licencia no están disponibles"</string>
     <string name="about_model" msgid="6625269442206323995">"Modelo"</string>
     <string name="about_version" msgid="1177287676732287266">"Versión"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Fecha"</string>
     <string name="system_time" msgid="6726022312605226285">"Hora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Establecer fecha"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Formato de fecha"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Establecer hora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Establecer zona horaria"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Formato de 24 horas"</string>
diff --git a/Settings/res/values-et-notouch/strings.xml b/Settings/res/values-et-notouch/strings.xml
index 406f058..6291fdc 100644
--- a/Settings/res/values-et-notouch/strings.xml
+++ b/Settings/res/values-et-notouch/strings.xml
@@ -20,57 +20,6 @@
     <string name="wifi_setup_input_password" msgid="4324884380214448502">"Sisestage võrgu <xliff:g id="SSID">%1$s</xliff:g> parool"</string>
     <string name="wifi_setup_waiting_for_join" msgid="42826539810553389">"Liitumine võrguga ^1"</string>
     <string name="wifi_setup_connection_success" msgid="3362351168182711828">"Ühendamine õnnestus!"</string>
-    <string name="setup_ir" msgid="8305193430921797241">"Kaugjuhtimispuldi seadistamine"</string>
-    <string name="remote_setup_welcome_message_description" msgid="9134446428396720516">"Kaugjuhtimispult suudab juhtida teleri ja AV-vastuvõtja toidet, sisendi vahetamist ning helitugevust"</string>
-    <string name="remote_setup_welcome_message_hint" msgid="3193005012448600181">"Saate seda hiljem muuta jaotises Seaded"</string>
-    <string name="remote_setup_welcome_message_choice_yes" msgid="5685232858099010013">"Seadista seda"</string>
-    <string name="remote_setup_welcome_message_choice_no" msgid="4512130141361047728">"Mitte praegu"</string>
-    <string name="remote_setup_welcome_message_choice_learn_more" msgid="1450743243355011188">"Lisateave"</string>
-    <string name="remote_setup_configuring_title" msgid="426693490088036953">"Seadistamine"</string>
-    <string name="tv_brand_selection_title" msgid="115806286404235523">"Valige teleri bränd"</string>
-    <string name="verify_tv_works_title" msgid="3032439000825004562">"Proovige järele"</string>
-    <string name="verify_tv_works_title_second" msgid="385858407975452465">"Kuidas nüüd?"</string>
-    <string name="remote_setup_tv_works_choice_yes" msgid="4845224377319634589">"Jah, see toimib"</string>
-    <string name="remote_setup_tv_works_choice_no" msgid="4592512199517822882">"Ei, see ei toimi"</string>
-    <string name="remote_setup_tv_works_choice_exit" msgid="3284401175722431348">"Vii hiljem lõpule"</string>
-    <string name="remote_setup_av_receiver_message_title" msgid="6684021872456430428">"Kas kasutate AV-vastuvõtjat helitugevuse reguleerimiseks või videoallikate valimiseks?"</string>
-    <string name="remote_setup_av_receiver_message_choice_yes" msgid="4425950273612887422">"Jah"</string>
-    <string name="remote_setup_av_receiver_message_choice_no" msgid="4110689241054488465">"Ei, ainult teler"</string>
-    <string name="remote_setup_av_receiver_message_choice_unknown" msgid="7929184207846917118">"Ma ei ole kindel"</string>
-    <string name="av_receiver_brand_selection_title" msgid="6590559258588648873">"Valige AV-vastuvõtja bränd"</string>
-    <string name="verify_av_receiver_works_title" msgid="269543338100774333">"Proovige järele"</string>
-    <string name="verify_av_receiver_works_title_second" msgid="5746428972280536169">"Kuidas nüüd?"</string>
-    <string name="remote_setup_av_receiver_works_choice_yes" msgid="3958668567541773813">"Jah, see toimib"</string>
-    <string name="remote_setup_av_receiver_works_choice_no" msgid="4298074971218301801">"Ei, see ei toimi"</string>
-    <string name="remote_setup_complete_title" msgid="5621039651988402414">"Teie kaugjuhtimispult on seadistatud"</string>
-    <string name="remote_setup_complete_indicator" msgid="7561911666937200298">"✔"</string>
-    <string name="remote_setup_complete_hint" msgid="895288876842034764">"Saate seda muuta ja värskendada jaotises Seaded"</string>
-    <string name="remote_setup_failure_title" msgid="5556977469090883888">"Paistab, et proovisite kõiki Sony teleri jaoks saadaolevaid koode ja ükski neist ei toiminud"</string>
-    <string name="remote_setup_no_more_codes_title" msgid="8248001602463811004">"Valitud brändi jaoks pole rohkem ühtegi valikut."</string>
-    <string name="remote_volume_control_title" msgid="42790796387499754">"Helitugevuse reguleerimine"</string>
-    <string name="remote_volume_control_description" msgid="1709266463890271158">"Millist seadet peaks teie kaugjuhtimispuldi helitugevuseklahvid juhtima?"</string>
-    <string name="remote_volume_control_tv" msgid="8238742772961949484">"Teler"</string>
-    <string name="remote_volume_control_avr" msgid="1210344689909782196">"AV-vastuvõtja"</string>
-    <string name="remote_volume_control_more_info" msgid="3974235951312948896">"Lisateave"</string>
-    <string name="remote_input_control_title" msgid="2162123799829832793">"Sisendi juhtimine"</string>
-    <string name="remote_input_control_description" msgid="4463232750558670880">"Millist seadet peaks teie kaugjuhtimispuldi sisendklahv juhtima?"</string>
-    <string name="remote_input_control_tv" msgid="1161797798141087133">"Teler"</string>
-    <string name="remote_input_control_avr" msgid="4332681403776201898">"AV-vastuvõtja"</string>
-    <string name="remote_input_control_more_info" msgid="2288173413092344097">"Lisateave"</string>
-    <string name="remote_power_control_title" msgid="6900887500636256080">"Toite juhtimine"</string>
-    <string name="remote_power_control_description" msgid="3169112762029996294">"Millist seadet peaks teie kaugjuhtimispuldi toiteklahv juhtima?"</string>
-    <string name="remote_power_control_tv" msgid="20401013011107997">"Teler"</string>
-    <string name="remote_power_control_avr" msgid="7915107400409384444">"AV-vastuvõtja"</string>
-    <string name="remote_power_control_more_info" msgid="6548476606481318540">"Lisateave"</string>
-    <string name="remote_setup_tv_unable_to_configure_title" msgid="4278769121940609448">"Seda telerit ei saa seadistada"</string>
-    <string name="remote_setup_tv_unable_to_configure_hint" msgid="1731804913207624724">"Saate seda hiljem teha jaotises Seaded."</string>
-    <string name="remote_setup_tv_unable_to_configure_continue" msgid="3805427230334915588">"Jätka seadistamist"</string>
-    <string name="remote_setup_tv_unable_to_configure_try_again" msgid="6302613495483136852">"Proovi uuesti"</string>
-    <string name="remote_setup_avr_unable_to_configure_title" msgid="7801918594788868621">"Seda AV-vastuvõtjat ei saa seadistada"</string>
-    <string name="remote_setup_avr_unable_to_configure_hint" msgid="1160999973083806587">"Saate seda hiljem teha jaotises Seaded."</string>
-    <string name="remote_setup_avr_unable_to_configure_continue" msgid="6233717853267060396">"Jätka seadistamist"</string>
-    <string name="remote_setup_avr_unable_to_configure_try_again" msgid="4693947869846354939">"Proovi uuesti"</string>
-    <string name="remote_programmed_successfully_ok" msgid="1375513531893934307">"OK"</string>
     <string name="device_apps_app_management_version" msgid="6315648665194084382">"versioon <xliff:g id="APP_VERSION">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_force_stop" msgid="1803832648099079651">"Sunni peatuma"</string>
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Kui sunnite rakenduse peatuma, võib see valesti käituda."</string>
diff --git a/Settings/res/values-et-rEE-notouch/strings.xml b/Settings/res/values-et-rEE-notouch/strings.xml
index b55353e..06bf14a 100644
--- a/Settings/res/values-et-rEE-notouch/strings.xml
+++ b/Settings/res/values-et-rEE-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Kui sunnite rakenduse peatuma, võib see valesti käituda."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalli"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Kas soovite selle rakenduse desinstallida?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Keela"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Kas soovite selle rakenduse keelata?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Luba"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Kas soovite selle rakenduse lubada?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Kustuta andmed"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Rakenduse andmed kustutatakse jäädavalt."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"See hõlmab kõiki faile, seadeid, kontosid, andmebaase jms."</string>
diff --git a/Settings/res/values-et-rEE/strings.xml b/Settings/res/values-et-rEE/strings.xml
index c0bcb36..981f651 100644
--- a/Settings/res/values-et-rEE/strings.xml
+++ b/Settings/res/values-et-rEE/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Varundamine ja taastamine"</string>
     <string name="device_reset" msgid="2827002349560023125">"Tehaseandmetele lähtestamine"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibreerimine"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Allalaaditud rakendused"</string>
     <string name="apps_system" msgid="2499191125802829425">"Süsteemirakendused"</string>
     <string name="apps_running" msgid="6430310491739956228">"Töötavad rakendused"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Keel"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Klaviatuur"</string>
     <string name="system_search" msgid="2837264654143247611">"Otsing"</string>
-    <string name="system_security" msgid="4190058778883258927">"Turvalisus ja piirangud"</string>
+    <string name="system_security" msgid="8230080273993484407">"Turvalisus ja piirangud"</string>
     <string name="system_speech" msgid="8128688499687306982">"Kõne"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Sisendid"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Juurdepääsu seaded"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Süsteemivärskendus"</string>
     <string name="about_preference" msgid="4131396784531360434">"Teave"</string>
     <string name="device_name" msgid="2670488158531273028">"Seadme nimi"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Taaskäivita"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Juriidiline teave"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantii"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Avatud lähtekoodi litsentsid"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Kuva teenusetingimused"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Kuva privaatsuseeskirjad"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Kuva lisatingimused"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google\'i juriidiline teave"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Litsentsiandmed pole saadaval"</string>
     <string name="about_model" msgid="6625269442206323995">"Mudel"</string>
     <string name="about_version" msgid="1177287676732287266">"Versioon"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Kuupäev"</string>
     <string name="system_time" msgid="6726022312605226285">"Kellaaeg"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Kuupäeva määramine"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Kuupäevavormingu valimine"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Kellaaja määramine"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Ajavööndi määramine"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-tunnise vormingu kasutamine"</string>
diff --git a/Settings/res/values-eu-rES-notouch/strings.xml b/Settings/res/values-eu-rES-notouch/strings.xml
index 8e54b13..c694b2a 100644
--- a/Settings/res/values-eu-rES-notouch/strings.xml
+++ b/Settings/res/values-eu-rES-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Aplikazioak gelditzera behartzen badituzu, agian portaera okerra izan dezakete."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalatu"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Aplikazioa desinstalatu nahi duzu?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Desgaitu"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Aplikazioa desgaitu nahi duzu?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Gaitu"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Aplikazioa gaitu nahi duzu?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Garbitu datuak"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Aplikazioaren datu guztiak betiko ezabatuko dira;"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"besteak beste, fitxategi, ezarpen, kontu eta datu-base guztiak."</string>
diff --git a/Settings/res/values-eu-rES/strings.xml b/Settings/res/values-eu-rES/strings.xml
index 62b2a3c..5287458 100644
--- a/Settings/res/values-eu-rES/strings.xml
+++ b/Settings/res/values-eu-rES/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Babeskopiak eta leheneratzea"</string>
     <string name="device_reset" msgid="2827002349560023125">"Berrezarri jatorrizko datuak"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrazioa"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Deskargatutako aplikazioak"</string>
     <string name="apps_system" msgid="2499191125802829425">"Sistemaren aplikazioak"</string>
     <string name="apps_running" msgid="6430310491739956228">"Exekutatzen ari diren aplikazioak"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Hizkuntza"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teklatua"</string>
     <string name="system_search" msgid="2837264654143247611">"Bilatu"</string>
-    <string name="system_security" msgid="4190058778883258927">"Segurtasuna eta murrizketak"</string>
+    <string name="system_security" msgid="8230080273993484407">"Segurtasuna eta murriztapenak"</string>
     <string name="system_speech" msgid="8128688499687306982">"Hizketa"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Sarrerak"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Erabilerraztasuna"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Sistemaren eguneratzea"</string>
     <string name="about_preference" msgid="4131396784531360434">"Honi buruz"</string>
     <string name="device_name" msgid="2670488158531273028">"Gailuaren izena"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Berrabiarazi"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Lege-informazioa"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Bermea"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Kode irekiko lizentziak"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Ikusi Zerbitzu-baldintzak"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Ikusi Pribatutasun-gidalerroak"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ikusi baldintza gehigarriak"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google-ren lege-oharrak"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Lizentziaren datuak ez daude erabilgarri"</string>
     <string name="about_model" msgid="6625269442206323995">"Modeloa"</string>
     <string name="about_version" msgid="1177287676732287266">"Bertsioa"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Ordua"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Ezarri data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Aukeratu dataren formatua"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Ezarri ordua"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Idatzi ordu-zona"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Erabili 24 orduko formatua"</string>
@@ -405,7 +407,7 @@
     <string name="agree" msgid="1235622082275451350">"Onartu"</string>
     <string name="disagree" msgid="9170636026862400981">"Ez nago ados"</string>
     <string name="security_unknown_sources_title" msgid="769762478057744545">"Iturburu ezezagunak"</string>
-    <string name="security_unknown_sources_desc" msgid="7197053279914817124">"Baimendu Play Store ez diren iturburuetatik datozen aplikazioak instalatzea."</string>
+    <string name="security_unknown_sources_desc" msgid="7197053279914817124">"Baimendu Play Store ez diren iturburuetatik datozen aplikazioak instalatzea"</string>
     <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"Zure gailuak eta datu pertsonalek iturburu ezezagunetako aplikazioen erasoak jaso ditzakete. Aplikazio horiek erabiltzen badituzu, gailuari gerta dakizkiokeen kalteen edo datu-galeren erantzule bakarra zeu zarela onartzen duzu."</string>
     <string name="security_verify_apps_title" msgid="5787946958632254988">"Egiaztatu aplikazioak"</string>
     <string name="security_verify_apps_desc" msgid="1456317893117818733">"Debekatu edo abisatu kalteak eragin ditzaketen aplikazioak instalatu aurretik."</string>
diff --git a/Settings/res/values-eu-rPV-notouch/strings.xml b/Settings/res/values-eu-rPV-notouch/strings.xml
index 98def3e..7e9aa24 100644
--- a/Settings/res/values-eu-rPV-notouch/strings.xml
+++ b/Settings/res/values-eu-rPV-notouch/strings.xml
@@ -25,165 +25,85 @@
     <skip />
     <!-- no translation found for wifi_setup_save_success (2001513015933996675) -->
     <skip />
-    <!-- no translation found for setup_ir (8305193430921797241) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_title (5476589388820014744) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_description (2490113907172564702) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_hint (3193005012448600181) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_choice_yes (5685232858099010013) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_choice_no (175673795270850846) -->
     <skip />
-    <!-- no translation found for remote_setup_configuring_title (426693490088036953) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_brand_selection_title (4426624334135525006) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_brand_not_listed (6399444939148833806) -->
     <skip />
-    <!-- no translation found for remote_setup_popular_brands (5266668021746622176) -->
     <skip />
-    <!-- no translation found for remote_setup_all_brands (4549396010551387027) -->
     <skip />
-    <!-- no translation found for verify_tv_works_title (3032439000825004562) -->
     <skip />
-    <!-- no translation found for verify_tv_works_description (5367161763698305110) -->
     <skip />
-    <!-- no translation found for verify_tv_works_title_second (385858407975452465) -->
     <skip />
-    <!-- no translation found for verify_tv_works_description_second (6491845798813188688) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_works_choice_yes (4845224377319634589) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_works_choice_no (4592512199517822882) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_works_choice_exit (3284401175722431348) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_message_title (2872952499181136479) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_message_choice_yes (4425950273612887422) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_message_choice_no (4110689241054488465) -->
     <skip />
-    <!-- no translation found for av_receiver_brand_selection_title (6590559258588648873) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_brand_not_list (3844561269362712169) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_title (269543338100774333) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_description (823315661416528145) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_title_second (5746428972280536169) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_description_second (441544714015585905) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_yes (3958668567541773813) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_no (6425368711913498529) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_exit (643490819476900552) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_title (7922835571489412611) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_indicator (7561911666937200298) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_description (6137050944153859244) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_tv (4708077946518308016) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_avr (8656836889865354332) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_tv_and_avr (4453597584162220399) -->
     <skip />
-    <!-- no translation found for remote_setup_failure_title (5665820270966778692) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_title (167374899889584010) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_description (8659030568193419721) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_choice_continue (2978201890199080045) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_choice_try_again (883803209087217919) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_title (1569711951085807000) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_description (691671526507009571) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_choice_continue (3661278022504253254) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_choice_try_again (7093479823678687125) -->
     <skip />
-    <!-- no translation found for remote_volume_control_title (42790796387499754) -->
     <skip />
-    <!-- no translation found for remote_volume_control_description (1709266463890271158) -->
     <skip />
-    <!-- no translation found for remote_volume_control_tv (8238742772961949484) -->
     <skip />
-    <!-- no translation found for remote_volume_control_avr (1210344689909782196) -->
     <skip />
-    <!-- no translation found for remote_volume_control_more_info (3974235951312948896) -->
     <skip />
-    <!-- no translation found for remote_input_control_title (2162123799829832793) -->
     <skip />
-    <!-- no translation found for remote_input_control_description (4463232750558670880) -->
     <skip />
-    <!-- no translation found for remote_input_control_tv (1161797798141087133) -->
     <skip />
-    <!-- no translation found for remote_input_control_avr (4332681403776201898) -->
     <skip />
-    <!-- no translation found for remote_input_control_more_info (2288173413092344097) -->
     <skip />
-    <!-- no translation found for remote_power_control_title (6900887500636256080) -->
     <skip />
-    <!-- no translation found for remote_power_control_description (3169112762029996294) -->
     <skip />
-    <!-- no translation found for remote_power_control_tv (20401013011107997) -->
     <skip />
-    <!-- no translation found for remote_power_control_avr (7915107400409384444) -->
     <skip />
-    <!-- no translation found for remote_power_control_more_info (6548476606481318540) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_title (4278769121940609448) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_description (8864537568753823798) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_hint (1731804913207624724) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_continue (3805427230334915588) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_try_again (6302613495483136852) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_title (7801918594788868621) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_description (1400910510206854454) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_hint (1160999973083806587) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_continue (6233717853267060396) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_try_again (4693947869846354939) -->
     <skip />
-    <!-- no translation found for remote_programmed_successfully_ok (1375513531893934307) -->
     <skip />
-    <!-- no translation found for remote_summary_title_configured (5771960008601106877) -->
     <skip />
-    <!-- no translation found for remote_summary_description_configured_tv_only (7739533340195955540) -->
     <skip />
-    <!-- no translation found for remote_summary_description_configured (2021732057311118918) -->
     <skip />
-    <!-- no translation found for remote_summary_change (6976485331757187056) -->
     <skip />
-    <!-- no translation found for remote_summary_do_not_change (4097498021633504763) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_title (4030643297327885317) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_description (3511320380471211038) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_choice_continue (8780389496840477364) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_choice_start_over (1027538826869717585) -->
     <skip />
     <!-- no translation found for device_apps_app_management_version (6315648665194084382) -->
     <skip />
diff --git a/Settings/res/values-fa-notouch/strings.xml b/Settings/res/values-fa-notouch/strings.xml
index 35ee909..dd8bb36 100644
--- a/Settings/res/values-fa-notouch/strings.xml
+++ b/Settings/res/values-fa-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"توقف اجباری یک برنامه ممکن است باعث عملکرد نادرست آن شود."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"حذف نصب"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"می‌خواهید این برنامه را حذف نصب کنید؟"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"غیرفعال‌ کردن"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"آیا می‌خواهید این برنامه را غیرفعال کنید؟"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"فعال کردن"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"آیا می‌خواهید این برنامه را فعال کنید؟"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"پاک کردن داده‌ها"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"تمام داده‌های این برنامه برای همیشه حذف می‌شوند."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"این شامل همه فایل‌ها، تنظیمات، حساب‌ها، پایگاه داده‌، و غیره می‌شود"</string>
diff --git a/Settings/res/values-fa/strings.xml b/Settings/res/values-fa/strings.xml
index 8f2ca45..6301909 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
     <string name="device_reset" msgid="2827002349560023125">"بازنشانی به داده‌های کارخانه"</string>
     <string name="device_calibration" msgid="8632962533376605191">"کالیبراسیون"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"برنامه‌های دانلود شده"</string>
     <string name="apps_system" msgid="2499191125802829425">"برنامه‌های سیستم"</string>
     <string name="apps_running" msgid="6430310491739956228">"برنامه‌های در حال اجرا"</string>
@@ -64,7 +68,7 @@
     <string name="accessories_camera" msgid="503302832375993697">"دوربین"</string>
     <string name="accessories_add" msgid="1347802656349218830">"افزودن وسیله جانبی"</string>
     <string name="accessories_wifi_display" msgid="1107690327150126038">"Wi-Fi Display"</string>
-    <string name="accessory_state_pairing" msgid="7501989679637780963">"در حال جفت کردن..."</string>
+    <string name="accessory_state_pairing" msgid="7501989679637780963">"در حال مرتبط‌سازی..."</string>
     <string name="accessory_state_connecting" msgid="8777884957977608529">"در حال اتصال..."</string>
     <string name="accessory_state_error" msgid="4529815543328841909">"مرتبط‌سازی انجام نشد"</string>
     <string name="accessory_state_canceled" msgid="4419328837733619447">"لغو شد"</string>
@@ -82,11 +86,11 @@
     <string name="accessories_add_multiple_select" msgid="3696794187001405647">"برای مرتبط کردن با دستگاه انتخاب شده، دکمه مرتبط‌سازی را در این دستگاه فشار دهید و به مدت ۵ ثانیه نگه دارید"</string>
     <string name="error_action_not_supported" msgid="300552308104354666">"این عملکرد پشتیبانی نمی‌شود"</string>
     <string name="bluetooth_pairing_request" msgid="4523088117471287665">"درخواست مرتبط‌سازی با بلوتوث"</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="7031117992819855434">"برای مرتبط کردن با &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;، مطمئن شوید این کلید عبور را نشان می‌دهد: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="7031117992819855434">"برای مرتبط کردن با &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;، مطمئن شوید این کلیدواژه را نشان می‌دهد: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="8234127565393932499">"از: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;با این دستگاه مرتبط شود؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8951451728250058901">"برای مرتبط‌سازی با: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; را در آن تایپ کنید و سپس Return یا Enter را فشار دهید."</string>
     <string name="bluetooth_enter_pin_msg" msgid="7443458826667686394">"برای مرتبط‌سازی با: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;،‏ &lt;br&gt;پین لازم برای این دستگاه را تایپ کنید:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="7980787196089653577">"برای مرتبط‌سازی با: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;،‏ &lt;br&gt;کلید عبور لازم برای دستگاه را تایپ کنید:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="7980787196089653577">"برای مرتبط‌سازی با: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;،‏ &lt;br&gt;کلیدواژه درخواستی برای دستگاه را تایپ کنید:"</string>
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"معمولاً ۰۰۰۰ یا ۱۲۳۴"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"مرتبط‌سازی"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"لغو"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"زبان"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"صفحه کلید"</string>
     <string name="system_search" msgid="2837264654143247611">"جستجو"</string>
-    <string name="system_security" msgid="4190058778883258927">"امنیت و محدودیت‌ها"</string>
+    <string name="system_security" msgid="8230080273993484407">"امنیت و محدودیت‌ها"</string>
     <string name="system_speech" msgid="8128688499687306982">"گفتار"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ورودی‌ها"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"قابلیت دسترسی"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"به‌روزرسانی سیستم"</string>
     <string name="about_preference" msgid="4131396784531360434">"درباره"</string>
     <string name="device_name" msgid="2670488158531273028">"نام دستگاه"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"راه‌اندازی مجدد"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"اطلاعات حقوقی"</string>
     <string name="about_warranty" msgid="5736003473060436384">"ضمانت‌نامه"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"مجوزهای منبع آزاد"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"مشاهده شرایط سرویس"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"مشاهده خط‌مشی رازداری"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"مشاهده شرایط اضافی"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"شرایط حقوقی Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"داده مجوز در دسترس نیست"</string>
     <string name="about_model" msgid="6625269442206323995">"مدل"</string>
     <string name="about_version" msgid="1177287676732287266">"نسخه"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"تاریخ"</string>
     <string name="system_time" msgid="6726022312605226285">"زمان"</string>
     <string name="system_set_date" msgid="2437586307768561116">"تنظیم تاریخ"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"فرمت تاریخ را انتخاب کنید"</string>
     <string name="system_set_time" msgid="4661804115501057452">"تنظیم زمان"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"تنظیم منطقه زمانی"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"استفاده از قالب ۲۴ ساعته"</string>
diff --git a/Settings/res/values-fi-notouch/strings.xml b/Settings/res/values-fi-notouch/strings.xml
index e413fcd..96916a4 100644
--- a/Settings/res/values-fi-notouch/strings.xml
+++ b/Settings/res/values-fi-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Jos pakotat sovelluksen pysähtymään, se saattaa alkaa toimia virheellisesti."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Poista"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Haluatko poistaa tämän sovelluksen?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Poista käytöstä"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Haluatko poistaa tämän sovelluksen käytöstä?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Ota käyttöön"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Haluatko ottaa tämän sovelluksen käyttöön?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Tyhjennä tiedot"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Kaikki sovelluksen tiedot poistetaan pysyvästi."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Tämä sisältää kaikki tiedostot, asetukset, tilit, tietokannat jne."</string>
@@ -50,7 +54,7 @@
     <string name="device_daydreams_screen_off_summary" msgid="6350806465141059041">"<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> Unelmat-tilan käynnistymisen jälkeen"</string>
     <string name="backup_configure_account_default_summary" msgid="2013649183664358673">"Millään tilillä ei ole tällä hetkellä varmuuskopiota"</string>
     <string name="backup_erase_dialog_title" msgid="8900389956460363471"></string>
-    <string name="backup_erase_dialog_message" msgid="448169495686297910">"Haluatko lopettaa wifi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
+    <string name="backup_erase_dialog_message" msgid="448169495686297910">"Haluatko lopettaa Wi-Fi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="privacy_backup_data" msgid="3652306596140877278">"Varmuuskopioi tiedot"</string>
     <string name="privacy_backup_account" msgid="6127132568071889274">"Varmuuskopioi tili"</string>
     <string name="privacy_automatic_restore" msgid="8896792578363571896">"Automaattinen palauttaminen"</string>
diff --git a/Settings/res/values-fi/strings.xml b/Settings/res/values-fi/strings.xml
index df6e3c9..dcff0fb 100644
--- a/Settings/res/values-fi/strings.xml
+++ b/Settings/res/values-fi/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Varmuuskopiointi ja palautus"</string>
     <string name="device_reset" msgid="2827002349560023125">"Tehdasasetuksien palauttaminen"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrointi"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Ladatut sovellukset"</string>
     <string name="apps_system" msgid="2499191125802829425">"Järjestelmäsovellukset"</string>
     <string name="apps_running" msgid="6430310491739956228">"Käynnissä olevat sovellukset"</string>
@@ -95,21 +99,20 @@
     <string name="system_language" msgid="2337138146114609247">"Kieli"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Näppäimistö"</string>
     <string name="system_search" msgid="2837264654143247611">"Haku"</string>
-    <string name="system_security" msgid="4190058778883258927">"Turvallisuus ja rajoitukset"</string>
+    <string name="system_security" msgid="8230080273993484407">"Turvallisuus ja rajoitukset"</string>
     <string name="system_speech" msgid="8128688499687306982">"Puhe"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Tulot"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Esteettömyys"</string>
-    <string name="system_developer_options" msgid="3237985523474863638">"Kehittäjävaihtoehdot"</string>
+    <string name="system_developer_options" msgid="3237985523474863638">"Kehittäjäasetukset"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ei mitään"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Järjestelmäpäivitys"</string>
     <string name="about_preference" msgid="4131396784531360434">"Tietoja"</string>
     <string name="device_name" msgid="2670488158531273028">"Laitteen nimi"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Käynnistä uudelleen"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Oikeudelliset tiedot"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Takuu"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Avoimen lähdekoodin käyttöluvat"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Näytä käyttöehdot"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Näytä tietosuojakäytäntö"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Näytä lisäehdot"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Googlen lakiasiat"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Käyttölupatietoja ei ole saatavilla"</string>
     <string name="about_model" msgid="6625269442206323995">"Malli"</string>
     <string name="about_version" msgid="1177287676732287266">"Versio"</string>
@@ -141,7 +144,7 @@
     <string name="title_mac_address" msgid="3428401680168668544">"MAC-osoite"</string>
     <string name="title_signal_strength" msgid="205478650262078041">"Signaalin vahvuus"</string>
     <string name="title_ip_address" msgid="4533523100923004711">"IP-osoite"</string>
-    <string name="title_ssid" msgid="4858945903642469730">"Syötä nimi tai wifi-verkko"</string>
+    <string name="title_ssid" msgid="4858945903642469730">"Syötä nimi tai Wi-Fi-verkko"</string>
     <string name="title_internet_connection" msgid="8710084774588697646">"Internetyhteys"</string>
     <string name="connected" msgid="7563100162902079938">"Yhdistetty"</string>
     <string name="not_connected" msgid="6858480380326923017">"Ei yhdistetty"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Päiväys"</string>
     <string name="system_time" msgid="6726022312605226285">"Aika"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Aseta päivämäärä"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Valitse päivämäärän muoto"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Aseta aika"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Aseta aikavyöhyke"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Käytä 24-tuntista kelloa"</string>
@@ -280,7 +282,7 @@
     <string name="location_no_recent_apps" msgid="4218851908476344030">"Mikään sovellus ei ole pyytänyt sijaintia äskettäin"</string>
     <string name="location_high_battery_use" msgid="576143332793626088">"Suuri akun kulutus"</string>
     <string name="location_low_battery_use" msgid="5756040390248358148">"Vähäinen akun kulutus"</string>
-    <string name="location_mode_wifi_description" msgid="2778774510654527264">"Paikanna wifi-verkkojen avulla"</string>
+    <string name="location_mode_wifi_description" msgid="2778774510654527264">"Paikanna Wi-Fi-verkkojen avulla"</string>
     <string name="location_status" msgid="3456414279428237558">"Sijainnin tila"</string>
     <string name="location_services" msgid="5441085185119797200">"Sijaintipalvelut"</string>
     <string name="on" msgid="6683600681314500652">"Käytössä"</string>
@@ -289,10 +291,10 @@
     <string name="third_party_location_services_title" msgid="4089136801976399147">"Kolmansien osapuolten sijaintipalvelut"</string>
     <string name="location_reporting" msgid="3054236612250063073">"Sijainnin ilmoittaminen"</string>
     <string name="location_history" msgid="2946680949724247804">"Sijaintihistoria"</string>
-    <string name="location_reporting_desc" msgid="6256424995139430823">"Google käyttää tätä ominaisuutta esimerkiksi Google Nytissä ja Google Mapsissa. Sijainnin ilmoittamisen käyttöönotto sallii kaikkien tätä ominaisuutta käyttävien Google-tuotteiden tallentaa ja käyttää laitteesi viimeisimpiä sijaintitietoja ja liittää ne Google-tiliisi."</string>
-    <string name="location_history_desc" msgid="3861249867748294369">"Kun sijaintihistoria on käytössä tässä tilissä, Google voi tallentaa laitteen sijaintitietoja omien sovellustesi käyttöön.\n\nGoogle Maps voi esimerkiksi antaa reittiohjeita ja Google Nyt ilmoittaa työmatkaliikenteestä.\n\nVoit poistaa sijaintihistorian käytöstä milloin tahansa, mutta käytöstä poistaminen ei poista ominaisuutta pysyvästi. Voit hallinnoida sijaintihistoriaasi osoitteessa maps.google.com/locationhistory."</string>
+    <string name="location_reporting_desc" msgid="6256424995139430823">"Google käyttää tätä ominaisuutta esimerkiksi Google Now\'ssa ja Google Mapsissa. Sijainnin ilmoittamisen käyttöönotto sallii kaikkien tätä ominaisuutta käyttävien Google-tuotteiden tallentaa ja käyttää laitteesi viimeisimpiä sijaintitietoja ja liittää ne Google-tiliisi."</string>
+    <string name="location_history_desc" msgid="3861249867748294369">"Kun sijaintihistoria on käytössä tässä tilissä, Google voi tallentaa laitteen sijaintitietoja omien sovellustesi käyttöön.\n\nGoogle Maps voi esimerkiksi antaa reittiohjeita ja Google Now ilmoittaa työmatkaliikenteestä.\n\nVoit poistaa sijaintihistorian käytöstä milloin tahansa, mutta käytöstä poistaminen ei poista ominaisuutta pysyvästi. Voit hallinnoida sijaintihistoriaasi osoitteessa maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="5804802702252280549">"Poista sijaintihistoria"</string>
-    <string name="delete_location_history_desc" msgid="4142806827237093397">"Poistaa sijaintihistoriasta kaikki laitteen tälle Google-tilille tallentamat tiedot. Toimintoa ei voi perua. Osa sovelluksista, kuten Googlen Nyt-palvelu, ei enää toimi."</string>
+    <string name="delete_location_history_desc" msgid="4142806827237093397">"Poistaa sijaintihistoriasta kaikki laitteen tälle Google-tilille tallentamat tiedot. Toimintoa ei voi perua. Osa sovelluksista, kuten Google Now, ei enää toimi."</string>
     <string name="system_services" msgid="7230571820151215779">"Palvelut"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Palveluasetukset"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Tekstitykset"</string>
@@ -475,7 +477,7 @@
     <string name="title_configure" msgid="6929522003149212388">"Asetukset"</string>
     <string name="desc_configure_keyboard" msgid="7187242843867404657">"Näppäimistöasetukset"</string>
     <string name="computing_size" msgid="2955133568424704042">"Lasketaan…"</string>
-    <string name="title_select_wifi_network" msgid="1038871400014761952">"Valitse wifi-verkko"</string>
+    <string name="title_select_wifi_network" msgid="1038871400014761952">"Valitse Wi-Fi-verkko"</string>
     <string name="accessories_wifi_display_rename_device" msgid="7416728299196887186">"Nimeä uudelleen"</string>
     <string name="accessories_wifi_display_enable" msgid="4779506305656453262">"Wi-Fi-näyttö"</string>
     <string name="accessories_wifi_display_pin_required" msgid="3242645267864813273">"PIN-koodi vaaditaan"</string>
diff --git a/Settings/res/values-fr-notouch/strings.xml b/Settings/res/values-fr-notouch/strings.xml
index b05841f..47d1378 100644
--- a/Settings/res/values-fr-notouch/strings.xml
+++ b/Settings/res/values-fr-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Si vous forcez l\'arrêt d\'une application, cela peut provoquer son dysfonctionnement."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Désinstaller"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Voulez-vous désinstaller cette application ?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Désactiver"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Voulez-vous désactiver cette application ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Activer"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Voulez-vous activer cette application ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Effacer les données"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Toutes les données de cette application vont être supprimées définitivement."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Cela inclut l\'ensemble des fichiers, des paramètres, des comptes, des bases de données, etc."</string>
diff --git a/Settings/res/values-fr-rCA-notouch/strings.xml b/Settings/res/values-fr-rCA-notouch/strings.xml
index 01510eb..bd75359 100644
--- a/Settings/res/values-fr-rCA-notouch/strings.xml
+++ b/Settings/res/values-fr-rCA-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Si vous forcez l\'arrêt d\'une application, cela peut provoquer son dysfonctionnement."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Désinstaller"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Voulez-vous désinstaller cette application?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Désactiver"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Voulez-vous désactiver cette application?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Activer"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Voulez-vous activer cette application?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Effacer les données"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Toutes les données de cette application vont être supprimées définitivement."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Cela inclut l\'ensemble des fichiers, des paramètres, des comptes, des bases de données, etc."</string>
diff --git a/Settings/res/values-fr-rCA/strings.xml b/Settings/res/values-fr-rCA/strings.xml
index 75b4d09..fb6c872 100644
--- a/Settings/res/values-fr-rCA/strings.xml
+++ b/Settings/res/values-fr-rCA/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sauvegarde et restauration"</string>
     <string name="device_reset" msgid="2827002349560023125">"Rétablir config. par défaut"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Étalonnage"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Applications téléchargées"</string>
     <string name="apps_system" msgid="2499191125802829425">"Applications système"</string>
     <string name="apps_running" msgid="6430310491739956228">"Applications en cours d\'exécution"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Langue"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Clavier"</string>
     <string name="system_search" msgid="2837264654143247611">"Rechercher"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sécurité et restrictions"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sécurité et restrictions"</string>
     <string name="system_speech" msgid="8128688499687306982">"Reconnaissance vocale"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entrées"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilité"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Mise à jour du système"</string>
     <string name="about_preference" msgid="4131396784531360434">"À propos"</string>
     <string name="device_name" msgid="2670488158531273028">"Nom de l\'appareil"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Redémarrer"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Renseignements juridiques"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantie"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licences de logiciels libres"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Afficher les conditions d\'utilisation"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Afficher la politique de confidentialité"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Afficher les conditions d\'utilisation supplémentaires"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Renseignements juridiques Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Les données concernant les licences ne sont pas accessibles."</string>
     <string name="about_model" msgid="6625269442206323995">"Modèle"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Date"</string>
     <string name="system_time" msgid="6726022312605226285">"Heure"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Définir la date"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Sélectionner le format de la date"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Définir l\'heure"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Définir le fuseau horaire"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Utiliser le format 24 heures"</string>
diff --git a/Settings/res/values-fr/strings.xml b/Settings/res/values-fr/strings.xml
index 6986cf8..cdcfb87 100644
--- a/Settings/res/values-fr/strings.xml
+++ b/Settings/res/values-fr/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sauvegarde et restauration"</string>
     <string name="device_reset" msgid="2827002349560023125">"Rétablir configuration d\'usine"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Étalonnage"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Applications téléchargées"</string>
     <string name="apps_system" msgid="2499191125802829425">"Applications système"</string>
     <string name="apps_running" msgid="6430310491739956228">"Applications en cours d’exécution"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Langue"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Clavier"</string>
     <string name="system_search" msgid="2837264654143247611">"Recherche"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sécurité et restrictions"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sécurité et restrictions"</string>
     <string name="system_speech" msgid="8128688499687306982">"Voix"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entrées"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilité"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Mise à jour du système"</string>
     <string name="about_preference" msgid="4131396784531360434">"À propos"</string>
     <string name="device_name" msgid="2670488158531273028">"Nom de l\'appareil"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Redémarrer"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informations légales"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantie"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licences Open Source"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Conditions d\'utilisation"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Règles de confidentialité"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Cond. d\'util. supplémentaires"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Informations légales Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Informations de licence indisponibles."</string>
     <string name="about_model" msgid="6625269442206323995">"Modèle"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Date"</string>
     <string name="system_time" msgid="6726022312605226285">"Heure"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Définir la date"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Sélectionner le format de la date"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Définir l\'heure"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Définir le fuseau horaire"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Utiliser le format 24 heures"</string>
diff --git a/Settings/res/values-gl-rES-notouch/strings.xml b/Settings/res/values-gl-rES-notouch/strings.xml
index 065af46..8d51587 100644
--- a/Settings/res/values-gl-rES-notouch/strings.xml
+++ b/Settings/res/values-gl-rES-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Se forzas a parada dunha aplicación, é posible que se comporte incorrectamente."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalar"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Queres desinstalar esta aplicación?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Desactivar"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Queres desactivar esta aplicación?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Activar"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Queres activar esta aplicación?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Borrar datos"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Eliminaranse todos os datos desta aplicación de forma permanente."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Isto inclúe todos os ficheiros, configuracións, contas, bases de datos, etc."</string>
diff --git a/Settings/res/values-gl-rES/arrays.xml b/Settings/res/values-gl-rES/arrays.xml
index effe29f..8df1471 100644
--- a/Settings/res/values-gl-rES/arrays.xml
+++ b/Settings/res/values-gl-rES/arrays.xml
@@ -72,9 +72,9 @@
     <item msgid="4410581208185456276">"Predeterminado"</item>
     <item msgid="9033306684422202101">"Sans Serif"</item>
     <item msgid="1864985245839120339">"Sans Serif condensada"</item>
-    <item msgid="2707402752636362906">"Monoespazado sans-serif"</item>
+    <item msgid="2707402752636362906">"Sans-serif monospace"</item>
     <item msgid="4549910217342216388">"Serif"</item>
-    <item msgid="4764344884232052861">"Monoespazado serif"</item>
+    <item msgid="4764344884232052861">"Serif monospace"</item>
     <item msgid="8561996903323025702">"Informal"</item>
     <item msgid="8403638572764467550">"Cursiva"</item>
     <item msgid="5560655268137500927">"Maiúsculas pequenas"</item>
diff --git a/Settings/res/values-gl-rES/strings.xml b/Settings/res/values-gl-rES/strings.xml
index a3120f4..c34a6cc 100644
--- a/Settings/res/values-gl-rES/strings.xml
+++ b/Settings/res/values-gl-rES/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Copia de seguranza e restauración"</string>
     <string name="device_reset" msgid="2827002349560023125">"Restablecemento dos datos de fábrica"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibración"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplicacións descargadas"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplicacións do sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplicacións en execución"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Idioma"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teclado"</string>
     <string name="system_search" msgid="2837264654143247611">"Buscar"</string>
-    <string name="system_security" msgid="4190058778883258927">"Seguranza e restricións"</string>
+    <string name="system_security" msgid="8230080273993484407">"Seguranza e restricións"</string>
     <string name="system_speech" msgid="8128688499687306982">"Voz"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entradas"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilidade"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Actualización do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Acerca de"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reiniciar"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Información legal"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantía"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licenzas de código aberto"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Consultar Condicións de servizo"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Consultar Política de privacidade"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ver condicións adicionais"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Información legal de Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Os datos da licenza non están dispoñibles"</string>
     <string name="about_model" msgid="6625269442206323995">"Modelo"</string>
     <string name="about_version" msgid="1177287676732287266">"Versión"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Hora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Definir data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Seleccionar formato de data"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Definir hora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Definir zona horaria"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Usar formato de 24 horas"</string>
diff --git a/Settings/res/values-gl-rGA-notouch/strings.xml b/Settings/res/values-gl-rGA-notouch/strings.xml
index 98def3e..7e9aa24 100644
--- a/Settings/res/values-gl-rGA-notouch/strings.xml
+++ b/Settings/res/values-gl-rGA-notouch/strings.xml
@@ -25,165 +25,85 @@
     <skip />
     <!-- no translation found for wifi_setup_save_success (2001513015933996675) -->
     <skip />
-    <!-- no translation found for setup_ir (8305193430921797241) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_title (5476589388820014744) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_description (2490113907172564702) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_hint (3193005012448600181) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_choice_yes (5685232858099010013) -->
     <skip />
-    <!-- no translation found for remote_setup_welcome_message_choice_no (175673795270850846) -->
     <skip />
-    <!-- no translation found for remote_setup_configuring_title (426693490088036953) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_brand_selection_title (4426624334135525006) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_brand_not_listed (6399444939148833806) -->
     <skip />
-    <!-- no translation found for remote_setup_popular_brands (5266668021746622176) -->
     <skip />
-    <!-- no translation found for remote_setup_all_brands (4549396010551387027) -->
     <skip />
-    <!-- no translation found for verify_tv_works_title (3032439000825004562) -->
     <skip />
-    <!-- no translation found for verify_tv_works_description (5367161763698305110) -->
     <skip />
-    <!-- no translation found for verify_tv_works_title_second (385858407975452465) -->
     <skip />
-    <!-- no translation found for verify_tv_works_description_second (6491845798813188688) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_works_choice_yes (4845224377319634589) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_works_choice_no (4592512199517822882) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_works_choice_exit (3284401175722431348) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_message_title (2872952499181136479) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_message_choice_yes (4425950273612887422) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_message_choice_no (4110689241054488465) -->
     <skip />
-    <!-- no translation found for av_receiver_brand_selection_title (6590559258588648873) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_brand_not_list (3844561269362712169) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_title (269543338100774333) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_description (823315661416528145) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_title_second (5746428972280536169) -->
     <skip />
-    <!-- no translation found for verify_av_receiver_works_description_second (441544714015585905) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_yes (3958668567541773813) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_no (6425368711913498529) -->
     <skip />
-    <!-- no translation found for remote_setup_av_receiver_works_choice_exit (643490819476900552) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_title (7922835571489412611) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_indicator (7561911666937200298) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_description (6137050944153859244) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_tv (4708077946518308016) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_avr (8656836889865354332) -->
     <skip />
-    <!-- no translation found for remote_setup_complete_tv_and_avr (4453597584162220399) -->
     <skip />
-    <!-- no translation found for remote_setup_failure_title (5665820270966778692) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_title (167374899889584010) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_description (8659030568193419721) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_choice_continue (2978201890199080045) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_tv_codes_choice_try_again (883803209087217919) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_title (1569711951085807000) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_description (691671526507009571) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_choice_continue (3661278022504253254) -->
     <skip />
-    <!-- no translation found for remote_setup_no_more_avr_codes_choice_try_again (7093479823678687125) -->
     <skip />
-    <!-- no translation found for remote_volume_control_title (42790796387499754) -->
     <skip />
-    <!-- no translation found for remote_volume_control_description (1709266463890271158) -->
     <skip />
-    <!-- no translation found for remote_volume_control_tv (8238742772961949484) -->
     <skip />
-    <!-- no translation found for remote_volume_control_avr (1210344689909782196) -->
     <skip />
-    <!-- no translation found for remote_volume_control_more_info (3974235951312948896) -->
     <skip />
-    <!-- no translation found for remote_input_control_title (2162123799829832793) -->
     <skip />
-    <!-- no translation found for remote_input_control_description (4463232750558670880) -->
     <skip />
-    <!-- no translation found for remote_input_control_tv (1161797798141087133) -->
     <skip />
-    <!-- no translation found for remote_input_control_avr (4332681403776201898) -->
     <skip />
-    <!-- no translation found for remote_input_control_more_info (2288173413092344097) -->
     <skip />
-    <!-- no translation found for remote_power_control_title (6900887500636256080) -->
     <skip />
-    <!-- no translation found for remote_power_control_description (3169112762029996294) -->
     <skip />
-    <!-- no translation found for remote_power_control_tv (20401013011107997) -->
     <skip />
-    <!-- no translation found for remote_power_control_avr (7915107400409384444) -->
     <skip />
-    <!-- no translation found for remote_power_control_more_info (6548476606481318540) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_title (4278769121940609448) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_description (8864537568753823798) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_hint (1731804913207624724) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_continue (3805427230334915588) -->
     <skip />
-    <!-- no translation found for remote_setup_tv_unable_to_configure_try_again (6302613495483136852) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_title (7801918594788868621) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_description (1400910510206854454) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_hint (1160999973083806587) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_continue (6233717853267060396) -->
     <skip />
-    <!-- no translation found for remote_setup_avr_unable_to_configure_try_again (4693947869846354939) -->
     <skip />
-    <!-- no translation found for remote_programmed_successfully_ok (1375513531893934307) -->
     <skip />
-    <!-- no translation found for remote_summary_title_configured (5771960008601106877) -->
     <skip />
-    <!-- no translation found for remote_summary_description_configured_tv_only (7739533340195955540) -->
     <skip />
-    <!-- no translation found for remote_summary_description_configured (2021732057311118918) -->
     <skip />
-    <!-- no translation found for remote_summary_change (6976485331757187056) -->
     <skip />
-    <!-- no translation found for remote_summary_do_not_change (4097498021633504763) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_title (4030643297327885317) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_description (3511320380471211038) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_choice_continue (8780389496840477364) -->
     <skip />
-    <!-- no translation found for remote_setup_finish_later_choice_start_over (1027538826869717585) -->
     <skip />
     <!-- no translation found for device_apps_app_management_version (6315648665194084382) -->
     <skip />
diff --git a/Settings/res/values-hi-notouch/strings.xml b/Settings/res/values-hi-notouch/strings.xml
index 8393e37..4318406 100644
--- a/Settings/res/values-hi-notouch/strings.xml
+++ b/Settings/res/values-hi-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"अगर आप किसी ऐप्स को बलपूर्वक रोकते हैं, तो वह गलत व्यवहार कर सकता है."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"अनइंस्टॉल करें"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"क्‍या आप इस ऐप्स  को अनइंस्‍टॉल करना चाहते हैं?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"अक्षम करें"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"क्या आप इस ऐप को अक्षम करना चाहते हैं?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"सक्षम करें"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"क्या आप इस ऐप को सक्षम करना चाहते हैं?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"डेटा साफ़ करें"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"इस ऐप्स  के सभी डेटा को स्थायी रूप से हटा दिया जाएगा."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</string>
diff --git a/Settings/res/values-hi/strings.xml b/Settings/res/values-hi/strings.xml
index 5f99094..71a452f 100644
--- a/Settings/res/values-hi/strings.xml
+++ b/Settings/res/values-hi/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"बैकअप लें और पुनर्स्‍थापित करें"</string>
     <string name="device_reset" msgid="2827002349560023125">"फ़ैक्टरी डेटा रीसेट"</string>
     <string name="device_calibration" msgid="8632962533376605191">"अंशांकन"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"डाउनलोड किए गए ऐप्स"</string>
     <string name="apps_system" msgid="2499191125802829425">"सिस्टम ऐप्स"</string>
     <string name="apps_running" msgid="6430310491739956228">"चल रहे ऐप्स"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"आमतौर पर 0000 या 1234"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"युग्‍मित करें"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"रहने दें"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google कास्ट"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"तिथि और समय"</string>
     <string name="system_language" msgid="2337138146114609247">"भाषा"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"कीबोर्ड"</string>
     <string name="system_search" msgid="2837264654143247611">"खोज"</string>
-    <string name="system_security" msgid="4190058778883258927">"सुरक्षा और प्रतिबंध"</string>
+    <string name="system_security" msgid="8230080273993484407">"सुरक्षा और प्रतिबंध"</string>
     <string name="system_speech" msgid="8128688499687306982">"बोली"</string>
     <string name="system_inputs" msgid="2413907183796651102">"इनपुट"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"सरल उपयोग"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"सिस्‍टम अपडेट"</string>
     <string name="about_preference" msgid="4131396784531360434">"संक्षिप्त विवरण"</string>
     <string name="device_name" msgid="2670488158531273028">"डिवाइस नाम"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"पुन: प्रारंभ करें"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"कानूनी जानकारी"</string>
     <string name="about_warranty" msgid="5736003473060436384">"वारंटी"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"ओपन सोर्स लाइसेंस"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"सेवा की शर्तें देखें"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"गोपनीयता नीति देखें"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"अतिरिक्त शर्तें देखें"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google विधिक"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"लाइसेंस डेटा अनुपलब्ध है"</string>
     <string name="about_model" msgid="6625269442206323995">"मॉडल"</string>
     <string name="about_version" msgid="1177287676732287266">"वर्शन"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"तिथि"</string>
     <string name="system_time" msgid="6726022312605226285">"समय"</string>
     <string name="system_set_date" msgid="2437586307768561116">"दिनांक सेट करें"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"दिनांक प्रारूप चुनें"</string>
     <string name="system_set_time" msgid="4661804115501057452">"समय सेट करें"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"समय क्षेत्र सेट करें"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-घंटे के प्रारूप का उपयोग करें"</string>
diff --git a/Settings/res/values-hr-notouch/strings.xml b/Settings/res/values-hr-notouch/strings.xml
index b0f7be4..9688e94 100644
--- a/Settings/res/values-hr-notouch/strings.xml
+++ b/Settings/res/values-hr-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ako prisilno zaustavite aplikaciju, možda će se ponašati nepredviđeno."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Deinstaliraj"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Želite li deinstalirati ovu aplikaciju?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Onemogući"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Želite li onemogućiti tu aplikaciju?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Omogući"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Želite li omogućiti tu aplikaciju?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Izbriši podatke"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Svi podaci te aplikacije trajno će se izbrisati."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"To uključuje sve datoteke, postavke, račune, baze podataka itd."</string>
diff --git a/Settings/res/values-hr/arrays.xml b/Settings/res/values-hr/arrays.xml
index 6d335ff..9b771e4 100644
--- a/Settings/res/values-hr/arrays.xml
+++ b/Settings/res/values-hr/arrays.xml
@@ -72,12 +72,12 @@
     <item msgid="4410581208185456276">"Zadano"</item>
     <item msgid="9033306684422202101">"Sans Serif"</item>
     <item msgid="1864985245839120339">"Sans Serif zgusnuti"</item>
-    <item msgid="2707402752636362906">"Fiksna širina bez serifa"</item>
+    <item msgid="2707402752636362906">"Sans-serif fiksne širine"</item>
     <item msgid="4549910217342216388">"Serif"</item>
-    <item msgid="4764344884232052861">"Fiksna širina sa serifima"</item>
-    <item msgid="8561996903323025702">"Jednostavno"</item>
+    <item msgid="4764344884232052861">"Serif fiksne širine"</item>
+    <item msgid="8561996903323025702">"Neformalni"</item>
     <item msgid="8403638572764467550">"Kurziv"</item>
-    <item msgid="5560655268137500927">"Mala slova"</item>
+    <item msgid="5560655268137500927">"Mali verzal"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4304493614734189861">"Vrlo malen"</item>
diff --git a/Settings/res/values-hr/strings.xml b/Settings/res/values-hr/strings.xml
index 651aa5b..52237ae 100644
--- a/Settings/res/values-hr/strings.xml
+++ b/Settings/res/values-hr/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sigurnosna kopija i vraćanje"</string>
     <string name="device_reset" msgid="2827002349560023125">"Vraćanje na tvorničko stanje"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibracija"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Preuzete aplikacije"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplikacije sustava"</string>
     <string name="apps_running" msgid="6430310491739956228">"Pokrenute aplikacije"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Jezik"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tipkovnica"</string>
     <string name="system_search" msgid="2837264654143247611">"Pretraživanje"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sigurnost i ograničenja"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sigurnost i ograničenja"</string>
     <string name="system_speech" msgid="8128688499687306982">"Govor"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Ulazi"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Pristupačnost"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Ažuriranje sustava"</string>
     <string name="about_preference" msgid="4131396784531360434">"O usluzi"</string>
     <string name="device_name" msgid="2670488158531273028">"Naziv uređaja"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Ponovo pokreni"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Pravne informacije"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Jamstvo"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licence otvorenog koda"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Prikaz Uvjeta pružanja usluge"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Prikaz Pravila o privatnosti"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Prikaz Dodatnih uvjeta"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Googleove pravne informacije"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Podaci o licenci nisu dostupni"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Verzija"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Vrijeme"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Postavljanje datuma"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Odaberite format datuma"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Postavljanje vremena"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Postavljanje vremenske zone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Upotreba 24-satnog formata"</string>
diff --git a/Settings/res/values-hu-notouch/strings.xml b/Settings/res/values-hu-notouch/strings.xml
index ef9e685..a29f0f7 100644
--- a/Settings/res/values-hu-notouch/strings.xml
+++ b/Settings/res/values-hu-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ha egy alkalmazást leállásra kényszerít, lehetséges, hogy az hibásan fog működni."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Eltávolítás"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Eltávolítja ezt az alkalmazást?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Letiltás"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Letiltja az alkalmazást?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Engedélyezés"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Engedélyezi az alkalmazást?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Adatok törlése"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Az alkalmazásadatok véglegesen törlődnek."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Beleértve az összes fájlt, beállítást, fiókot, adatbázist stb."</string>
diff --git a/Settings/res/values-hu/strings.xml b/Settings/res/values-hu/strings.xml
index 5cb85ac..e870c29 100644
--- a/Settings/res/values-hu/strings.xml
+++ b/Settings/res/values-hu/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Biztonsági mentés és visszaállítás"</string>
     <string name="device_reset" msgid="2827002349560023125">"Gyári adatok visszaállítása"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrálás"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Letöltött alkalmazások"</string>
     <string name="apps_system" msgid="2499191125802829425">"Rendszeralkalmazások"</string>
     <string name="apps_running" msgid="6430310491739956228">"Futó alkalmazások"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Nyelv"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Billentyűzet"</string>
     <string name="system_search" msgid="2837264654143247611">"Keresés"</string>
-    <string name="system_security" msgid="4190058778883258927">"Biztonság és korlátozások"</string>
+    <string name="system_security" msgid="8230080273993484407">"Biztonság és korlátozások"</string>
     <string name="system_speech" msgid="8128688499687306982">"Beszéd"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Csatlakozók"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Kisegítő lehetőségek"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Rendszerfrissítés"</string>
     <string name="about_preference" msgid="4131396784531360434">"Névjegy"</string>
     <string name="device_name" msgid="2670488158531273028">"Eszköz neve"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Újraindítás"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Jogi információk"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Jótállás"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Nyílt forráskódú licencek"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Általános Szerződési Feltételek"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Adatvédelmi irányelvek"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Kiegészítő feltételek"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google – jogi szabályozás"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"A licencadatok nem érhetők el"</string>
     <string name="about_model" msgid="6625269442206323995">"Modell"</string>
     <string name="about_version" msgid="1177287676732287266">"Verzió"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Dátum"</string>
     <string name="system_time" msgid="6726022312605226285">"Időpont"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Dátum beállítása"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Dátumformátum kiválasztása"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Idő beállítása"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Időzóna beállítása"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24 órás formátum használata"</string>
diff --git a/Settings/res/values-hy-rAM-notouch/strings.xml b/Settings/res/values-hy-rAM-notouch/strings.xml
index 1ae4967..1ad3647 100644
--- a/Settings/res/values-hy-rAM-notouch/strings.xml
+++ b/Settings/res/values-hy-rAM-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Եթե ստիպողաբար դադարեցնեք հավելվածը, հնարավոր է այն լավ չգործի:"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Ապատեղադրել"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Հեռացնե՞լ այս ծրագիրը:"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Անջատել"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Ցանկանո՞ւմ եք անջատել այս հավելվածը:"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Միացնել"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Ցանկանո՞ւմ եք միացնել այս հավելվածը:"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Մաքրել տվյալները"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Ծրագրի բոլոր տվյալները մշտապես կջնջվեն:"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Կջնջվեն բոլոր ֆայլերը, կարգավորումները, տյվալների շտեմարանները և այլն:"</string>
diff --git a/Settings/res/values-hy-rAM/strings.xml b/Settings/res/values-hy-rAM/strings.xml
index be03d39..8873e8d 100644
--- a/Settings/res/values-hy-rAM/strings.xml
+++ b/Settings/res/values-hy-rAM/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Պահուստավորում և վերականգնում"</string>
     <string name="device_reset" msgid="2827002349560023125">"Գործարանային կարգավորումների վերականգնում"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Չափաբերում"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Ներբեռնված հավելվածներ"</string>
     <string name="apps_system" msgid="2499191125802829425">"Համակարգային հավելվածներ"</string>
     <string name="apps_running" msgid="6430310491739956228">"Գործարկված հավելվածներ"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Լեզու"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Ստեղնաշար"</string>
     <string name="system_search" msgid="2837264654143247611">"Որոնում"</string>
-    <string name="system_security" msgid="4190058778883258927">"Անվտանգություն &amp; Սահմանափակումներ"</string>
+    <string name="system_security" msgid="8230080273993484407">"Անվտանգություն &amp; սահմանափակումներ"</string>
     <string name="system_speech" msgid="8128688499687306982">"Խոսք"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Մուտքեր"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Մատչելիություն"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Համակարգային թարմացում"</string>
     <string name="about_preference" msgid="4131396784531360434">"Սարքի մասին"</string>
     <string name="device_name" msgid="2670488158531273028">"Սարքի անունը"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Վերագործարկել"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Իրավական տեղեկություններ"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Երաշխիք"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Բաց կոդով ծրագրաշարի լիցենզիաներ"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Օգտագործման պայմաններ"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Գաղտնիության քաղաքականություն"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Լրացուցիչ դրույթներ"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google իրավական"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Արտոնագրի տվյալներն անհասանելի են"</string>
     <string name="about_model" msgid="6625269442206323995">"Մոդելը"</string>
     <string name="about_version" msgid="1177287676732287266">"Տարբերակը"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Ամսաթիվ"</string>
     <string name="system_time" msgid="6726022312605226285">"Ժամ"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Սահմանել ամսաթիվը"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Ամսաթվի ձևաչափը"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Սահմանել ժամը"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Ժամային գոտի"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-ժամյա ձևաչափ"</string>
diff --git a/Settings/res/values-in-notouch/strings.xml b/Settings/res/values-in-notouch/strings.xml
index 359905d..b0d0c62 100644
--- a/Settings/res/values-in-notouch/strings.xml
+++ b/Settings/res/values-in-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Jika Anda menghentikan aplikasi secara paksa, mungkin fungsinya akan terganggu."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Copot pemasangan"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Ingin mencopot pemasangan aplikasi ini?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Nonaktifkan"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Apakah Anda ingin menonaktifkan aplikasi ini?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Aktifkan"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Apakah Anda ingin mengaktifkan aplikasi ini?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Hapus data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Semua data aplikasi ini akan dihapus selamanya."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Termasuk semua file, setelan, akun, basis data, dsb."</string>
diff --git a/Settings/res/values-in/strings.xml b/Settings/res/values-in/strings.xml
index f598d17..19c6ee1 100644
--- a/Settings/res/values-in/strings.xml
+++ b/Settings/res/values-in/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Pencadangan &amp; pemulihan"</string>
     <string name="device_reset" msgid="2827002349560023125">"Kembalikan ke setelan pabrik"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrasi"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplikasi yang diunduh"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplikasi sistem"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplikasi yang berjalan"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Bahasa"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Keyboard"</string>
     <string name="system_search" msgid="2837264654143247611">"Penelusuran"</string>
-    <string name="system_security" msgid="4190058778883258927">"Keamanan &amp; Pembatasan"</string>
+    <string name="system_security" msgid="8230080273993484407">"Keamanan &amp; pembatasan"</string>
     <string name="system_speech" msgid="8128688499687306982">"Ucapan"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Masukan"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Aksesibilitas"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Pembaruan sistem"</string>
     <string name="about_preference" msgid="4131396784531360434">"Tentang"</string>
     <string name="device_name" msgid="2670488158531273028">"Nama perangkat"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Mulai Ulang"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informasi hukum"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Jaminan"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Lisensi sumber terbuka"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Lihat Persyaratan Layanan"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Lihat Kebijakan Privasi"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Lihat Persyaratan Tambahan"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google hukum"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Data lisensi tidak tersedia"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Versi"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Tanggal"</string>
     <string name="system_time" msgid="6726022312605226285">"Waktu"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Setel tanggal"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Pilih format tanggal"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Setel waktu"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Setel zona waktu"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Gunakan format 24 jam"</string>
diff --git a/Settings/res/values-is-rIS-notouch/strings.xml b/Settings/res/values-is-rIS-notouch/strings.xml
index e7e3420..1162c79 100644
--- a/Settings/res/values-is-rIS-notouch/strings.xml
+++ b/Settings/res/values-is-rIS-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ef þú þvingar fram lokun forrits gæti það látið illa."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Eyða"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Viltu fjarlægja þetta forrit?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Slökkva"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Viltu gera þetta forrit óvirkt?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Kveikja"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Viltu gera þetta forrit virkt?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Hreinsa gögn"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Öllum gögnum þessa forrits verður eytt varanlega."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Þar með eru allar skrár, stillingar, reikningar, gagnagrunnar o.s.frv."</string>
diff --git a/Settings/res/values-is-rIS/strings.xml b/Settings/res/values-is-rIS/strings.xml
index 0df222d..20e3dee 100644
--- a/Settings/res/values-is-rIS/strings.xml
+++ b/Settings/res/values-is-rIS/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Afritun og endurheimt"</string>
     <string name="device_reset" msgid="2827002349560023125">"Núllstilling"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kvörðun"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Sótt forrit"</string>
     <string name="apps_system" msgid="2499191125802829425">"Kerfisforrit"</string>
     <string name="apps_running" msgid="6430310491739956228">"Forrit í gangi"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Tungumál"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Lyklaborð"</string>
     <string name="system_search" msgid="2837264654143247611">"Leita"</string>
-    <string name="system_security" msgid="4190058778883258927">"Öryggi og takmarkanir"</string>
+    <string name="system_security" msgid="8230080273993484407">"Öryggi og takmarkanir"</string>
     <string name="system_speech" msgid="8128688499687306982">"Tal"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Inntak"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Aðgengi"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Kerfisuppfærsla"</string>
     <string name="about_preference" msgid="4131396784531360434">"Um"</string>
     <string name="device_name" msgid="2670488158531273028">"Heiti tækis"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Endurræsa"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Lagalegar upplýsingar"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Ábyrgð"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Leyfi opins kóða"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Skoða þjónustuskilmálana"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Skoða persónuverndarstefnuna"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Skoða viðbótarskilmálana"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Lagalegt efni Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Leyfisgögn eru óaðgengileg"</string>
     <string name="about_model" msgid="6625269442206323995">"Gerð"</string>
     <string name="about_version" msgid="1177287676732287266">"Útgáfa"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Dagsetning"</string>
     <string name="system_time" msgid="6726022312605226285">"Tími"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Stilla dagsetningu"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Veldu dagsetningarsnið"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Stilla tíma"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Velja tímabelti"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Nota 24 tíma kerfið"</string>
diff --git a/Settings/res/values-it-notouch/strings.xml b/Settings/res/values-it-notouch/strings.xml
index ced82dc..30f99a0 100644
--- a/Settings/res/values-it-notouch/strings.xml
+++ b/Settings/res/values-it-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Se forzi l\'interruzione di un\'applicazione, tale applicazione potrebbe funzionare in modo anomalo."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Disinstalla"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Vuoi disinstallare questa applicazione?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Disabilita"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Vuoi disabilitare questa app?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Abilita"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Vuoi abilitare questa app?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Cancella dati"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Tutti i dati di questa app verranno eliminati definitivamente."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Ciò include tutti i file, le impostazioni, gli account, i database e così via."</string>
diff --git a/Settings/res/values-it/strings.xml b/Settings/res/values-it/strings.xml
index 277661a..3d535da 100644
--- a/Settings/res/values-it/strings.xml
+++ b/Settings/res/values-it/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Backup e ripristino"</string>
     <string name="device_reset" msgid="2827002349560023125">"Ripristino dati di fabbrica"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibrazione"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"App scaricate"</string>
     <string name="apps_system" msgid="2499191125802829425">"App di sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"App in esecuzione"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Lingua"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tastiera"</string>
     <string name="system_search" msgid="2837264654143247611">"Ricerca"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sicurezza e limitazioni"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sicurezza e limitazioni"</string>
     <string name="system_speech" msgid="8128688499687306982">"Voce"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Input"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilità"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Aggiornamento di sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Informazioni"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome dispositivo"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Riavvia"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informazioni legali"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garanzia"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licenze open source"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Visualizza Termini di servizio"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Visualizza Norme sulla privacy"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Visualizza Termini aggiuntivi"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Note legali Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Dati di licenza non disponibili"</string>
     <string name="about_model" msgid="6625269442206323995">"Modello"</string>
     <string name="about_version" msgid="1177287676732287266">"Versione"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Ora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Imposta data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Scegli il formato della data"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Imposta ora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Imposta fuso orario"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Usa formato 24 ore"</string>
diff --git a/Settings/res/values-iw-notouch/strings.xml b/Settings/res/values-iw-notouch/strings.xml
index cf89fad..f347de2 100644
--- a/Settings/res/values-iw-notouch/strings.xml
+++ b/Settings/res/values-iw-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"אם אתה מאלץ עצירה של אפליקציה, ייתכן שהיא לא תפעל כהלכה."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"הסר התקנה"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"האם אתה רוצה להסיר את ההתקנה של האפליקציה הזו?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"השבת"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"האם ברצונך להשבית את האפליקציה הזו?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"הפעל"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"האם ברצונך להפעיל את האפליקציה הזו?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"נקה נתונים"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"כל הנתונים של האפליקציה הזו יימחקו לצמיתות."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"הפעולה הזו כוללת את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכו\'."</string>
diff --git a/Settings/res/values-iw/strings.xml b/Settings/res/values-iw/strings.xml
index 1ab9239..8427c4a 100644
--- a/Settings/res/values-iw/strings.xml
+++ b/Settings/res/values-iw/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"גיבוי ושחזור"</string>
     <string name="device_reset" msgid="2827002349560023125">"איפוס נתוני יצרן"</string>
     <string name="device_calibration" msgid="8632962533376605191">"כיול"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"אפליקציות שהורדו"</string>
     <string name="apps_system" msgid="2499191125802829425">"אפליקציות מערכת"</string>
     <string name="apps_running" msgid="6430310491739956228">"אפליקציות פועלות"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"שפה"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"מקלדת"</string>
     <string name="system_search" msgid="2837264654143247611">"חיפוש"</string>
-    <string name="system_security" msgid="4190058778883258927">"אבטחה והגבלות"</string>
+    <string name="system_security" msgid="8230080273993484407">"אבטחה והגבלות"</string>
     <string name="system_speech" msgid="8128688499687306982">"דיבור"</string>
     <string name="system_inputs" msgid="2413907183796651102">"כניסות קלט"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"נגישות"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"עדכון מערכת"</string>
     <string name="about_preference" msgid="4131396784531360434">"מידע כללי"</string>
     <string name="device_name" msgid="2670488158531273028">"שם המכשיר"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"הפעל מחדש"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"מידע משפטי"</string>
     <string name="about_warranty" msgid="5736003473060436384">"אחריות"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"רישיונות לקוד פתוח"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"הצג את התנאים וההגבלות"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"הצג את מדיניות הפרטיות"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"הצג תנאים נוספים"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"הודעות משפטיות של Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"נתוני רישיון אינם זמינים"</string>
     <string name="about_model" msgid="6625269442206323995">"דגם"</string>
     <string name="about_version" msgid="1177287676732287266">"גרסה"</string>
@@ -142,7 +145,7 @@
     <string name="title_signal_strength" msgid="205478650262078041">"עוצמת אות"</string>
     <string name="title_ip_address" msgid="4533523100923004711">"כתובת IP"</string>
     <string name="title_ssid" msgid="4858945903642469730">"הזן שם של רשת Wi-Fi"</string>
-    <string name="title_internet_connection" msgid="8710084774588697646">"internet_connection"</string>
+    <string name="title_internet_connection" msgid="8710084774588697646">"חיבור לאינטרנט"</string>
     <string name="connected" msgid="7563100162902079938">"מחובר"</string>
     <string name="not_connected" msgid="6858480380326923017">"לא מחובר"</string>
     <string name="wifi_setting_header_available_networks" msgid="6244107218643835636">"Wi-Fi"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"תאריך"</string>
     <string name="system_time" msgid="6726022312605226285">"זמן"</string>
     <string name="system_set_date" msgid="2437586307768561116">"הגדר תאריך"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"בחירת פורמט תאריך"</string>
     <string name="system_set_time" msgid="4661804115501057452">"הגדר שעה"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"הגדר אזור זמן"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"שימוש בפורמט של 24 שעות"</string>
diff --git a/Settings/res/values-ja-notouch/strings.xml b/Settings/res/values-ja-notouch/strings.xml
index 45dbb8c..d586d21 100644
--- a/Settings/res/values-ja-notouch/strings.xml
+++ b/Settings/res/values-ja-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"アプリを強制停止すると、アプリが正常に機能しないことがあります。"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"アンインストール"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"このアプリをアンインストールしますか?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"無効にする"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"このアプリを無効にしますか?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"有効にする"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"このアプリを有効にしますか?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"データを消去"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"このアプリのすべてのデータが完全に削除されます。"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"すべてのファイル、設定、アカウント、 データベースなどが対象となります。"</string>
diff --git a/Settings/res/values-ja/strings.xml b/Settings/res/values-ja/strings.xml
index 7658cf4..44e0b9d 100644
--- a/Settings/res/values-ja/strings.xml
+++ b/Settings/res/values-ja/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"バックアップと復元"</string>
     <string name="device_reset" msgid="2827002349560023125">"データの初期化"</string>
     <string name="device_calibration" msgid="8632962533376605191">"キャリブレーション"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"ダウンロードしたアプリ"</string>
     <string name="apps_system" msgid="2499191125802829425">"システムアプリ"</string>
     <string name="apps_running" msgid="6430310491739956228">"実行中のアプリ"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"言語"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"キーボード"</string>
     <string name="system_search" msgid="2837264654143247611">"検索"</string>
-    <string name="system_security" msgid="4190058778883258927">"セキュリティ&制限"</string>
+    <string name="system_security" msgid="8230080273993484407">"セキュリティと制限"</string>
     <string name="system_speech" msgid="8128688499687306982">"音声"</string>
     <string name="system_inputs" msgid="2413907183796651102">"入力"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ユーザー補助"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"システムアップデート"</string>
     <string name="about_preference" msgid="4131396784531360434">"端末情報"</string>
     <string name="device_name" msgid="2670488158531273028">"端末名"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"再起動"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"法的情報"</string>
     <string name="about_warranty" msgid="5736003473060436384">"保証書"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"オープンソースライセンス"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"利用規約を表示"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"プライバシーポリシーを表示"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"追加規約を表示"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google利用規約"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"ライセンスデータは使用できません"</string>
     <string name="about_model" msgid="6625269442206323995">"モデル"</string>
     <string name="about_version" msgid="1177287676732287266">"バージョン"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"日付"</string>
     <string name="system_time" msgid="6726022312605226285">"時刻"</string>
     <string name="system_set_date" msgid="2437586307768561116">"日付の設定"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"日付形式の選択"</string>
     <string name="system_set_time" msgid="4661804115501057452">"時刻の設定"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"タイムゾーンの設定"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24時間表示の使用"</string>
diff --git a/Settings/res/values-ka-rGE-notouch/strings.xml b/Settings/res/values-ka-rGE-notouch/strings.xml
index 6e5d53c..7df0a58 100644
--- a/Settings/res/values-ka-rGE-notouch/strings.xml
+++ b/Settings/res/values-ka-rGE-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"თუ აპს ძალით შეაჩერებთ, შესაძლოა, ცუდად განაგრძოს მუშაობა."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"დეინსტალაცია"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"გსურთ, ამ აპის დეინსტალაცია?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"გამორთული"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"გსურთ გამორთოთ ეს აპლიკაცია?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"ჩართვა"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"გსურთ ამ აპლიკაციის ჩართვა?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"მონაცემების გასუფთავება"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ამ აპის მთელი მონაცემები სამუდამოდ წაიშლება."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"მათ შორის, ყველა ფაილი, პარამეტრი, ანგარიში, მონაცემთა ბაზა და სხვ."</string>
@@ -46,7 +50,7 @@
     <string name="device_daydreams_sleep_description" msgid="8438730889852772376">"Daydreaming იწყება უმოქმედობის ამ პერიოდის შემდეგ. თუ  Daydream არ არის არჩეული, ეკრანი გამოირთვება."</string>
     <string name="device_daydreams_sleep_summary" msgid="4442691086777437088">"უმოქმედობის <xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g>-ის შემდეგ"</string>
     <string name="device_daydreams_screen_off" msgid="1846621864054404830">"ძილის დრო"</string>
-    <string name="device_daydreams_screen_off_description" msgid="7699124270812914310">"პასიურობის ამ ხანგრძლივობის შემდეგ ეკრანი გამოირთვება."</string>
+    <string name="device_daydreams_screen_off_description" msgid="7699124270812914310">"ეკრანი გამოირთვება უმოქმედობის ამ პერიოდის შემდეგ."</string>
     <string name="device_daydreams_screen_off_summary" msgid="6350806465141059041">"<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g>-ში Daydream-ის შემდეგ"</string>
     <string name="backup_configure_account_default_summary" msgid="2013649183664358673">"ამჟამად არცერთი ანგარიში არ ინახავს დამარქაფებულ მონაცემებს"</string>
     <string name="backup_erase_dialog_title" msgid="8900389956460363471"></string>
diff --git a/Settings/res/values-ka-rGE/strings.xml b/Settings/res/values-ka-rGE/strings.xml
index b011d3d..857673c 100644
--- a/Settings/res/values-ka-rGE/strings.xml
+++ b/Settings/res/values-ka-rGE/strings.xml
@@ -22,7 +22,7 @@
     <string name="launcher_restricted_profile_app_name" msgid="671448012575234643">"შეზღუდული პროფილი"</string>
     <string name="header_category_device" msgid="4855983928659541345">"მოწყობილობა"</string>
     <string name="header_category_preferences" msgid="175105555164713972">"პარამეტრები"</string>
-    <string name="header_category_accessories" msgid="823295909353025991">"დისტანციური &amp; amp; აქსესუარები"</string>
+    <string name="header_category_accessories" msgid="823295909353025991">"დისტანციური &amp; აქსესუარები"</string>
     <string name="header_category_personal" msgid="8893959635328775096">"პირადი"</string>
     <string name="add_account" msgid="4098060223200619258">"ანგარიშის დამატება"</string>
     <string name="account_header_sync" msgid="2679585471372319471">"სინქრონიზაცია"</string>
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"დამარქაფება და აღდგენა"</string>
     <string name="device_reset" msgid="2827002349560023125">"ქარხნული მონაცემების აღდგენა"</string>
     <string name="device_calibration" msgid="8632962533376605191">"კალიბრაცია"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"ჩამოტვირთული აპები"</string>
     <string name="apps_system" msgid="2499191125802829425">"სისტემის აპები"</string>
     <string name="apps_running" msgid="6430310491739956228">"გაშვებული აპები"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ენა"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"კლავიატურ."</string>
     <string name="system_search" msgid="2837264654143247611">"ძიება"</string>
-    <string name="system_security" msgid="4190058778883258927">"უსაფრთხოება და შეზღუდვები"</string>
+    <string name="system_security" msgid="8230080273993484407">"უსაფრთხოება და შეზღუდვები"</string>
     <string name="system_speech" msgid="8128688499687306982">"წარმოთქმა"</string>
     <string name="system_inputs" msgid="2413907183796651102">"შეტანის პორტები"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"მარტივი წვდომა"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"სისტემის განახლება"</string>
     <string name="about_preference" msgid="4131396784531360434">"შესახებ"</string>
     <string name="device_name" msgid="2670488158531273028">"მოწყობილობის სახელი"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"გადატვირთვა"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"იურიდიული ინფორმაცია"</string>
     <string name="about_warranty" msgid="5736003473060436384">"გარანტია"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"ღია კოდის ლიცენზიები"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"მომსახურების პირობების ნახვა"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"კონფიდენციალურობის დებულების ნახვა"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"დამატებითი პირობების ნახვა"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google-ის სამართლებრივი ინფორმაცია"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"სალიცენზიო მონაცემები მიუწვდომელია"</string>
     <string name="about_model" msgid="6625269442206323995">"მოდელი"</string>
     <string name="about_version" msgid="1177287676732287266">"ვერსია"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"თარიღი"</string>
     <string name="system_time" msgid="6726022312605226285">"დრო"</string>
     <string name="system_set_date" msgid="2437586307768561116">"თარიღის დაყენება"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"თარიღის ფორმატის არჩევა"</string>
     <string name="system_set_time" msgid="4661804115501057452">"დროის დაყენება"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"დროის სარტყელის დაყენება"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-საათიანი ფორმატი"</string>
diff --git a/Settings/res/values-kk-rKZ-notouch/strings.xml b/Settings/res/values-kk-rKZ-notouch/strings.xml
index d43148b..ae4608a 100644
--- a/Settings/res/values-kk-rKZ-notouch/strings.xml
+++ b/Settings/res/values-kk-rKZ-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Егер қолданбаны мәжбүрлеп тоқтатсаңыз, күтпеген әрекет көрсетуі мүмкін."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Жою"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Бұл қолданбаны жоюды қалайсыз ба?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Өшіру"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Осы қолданбаны өшіру керек пе?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Қосу"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Осы қолданбаны қосу керек пе?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Деректерді тазалау"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Осы қолданбаның барлық деректері біржола жойылады."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Бұл барлық файлдарды, параметрлерді, есептік жазбаларды, дерекқорларды, т.б. қамтиды."</string>
diff --git a/Settings/res/values-kk-rKZ/strings.xml b/Settings/res/values-kk-rKZ/strings.xml
index a24d3f0..e65c310 100644
--- a/Settings/res/values-kk-rKZ/strings.xml
+++ b/Settings/res/values-kk-rKZ/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Сақтық көшірмелер және қалпына келтіру"</string>
     <string name="device_reset" msgid="2827002349560023125">"Зауыттық деректерді қалпына келтіру"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калибрлеу"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Жүктелген қолданбалар"</string>
     <string name="apps_system" msgid="2499191125802829425">"Жүйелік қолданбалар"</string>
     <string name="apps_running" msgid="6430310491739956228">"Іске қосылған қолданбалар"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Тіл"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Пернетақта"</string>
     <string name="system_search" msgid="2837264654143247611">"Іздеу"</string>
-    <string name="system_security" msgid="4190058778883258927">"Қауіпсіздік және шектеулер"</string>
+    <string name="system_security" msgid="8230080273993484407">"Қауіпсіздік және шектеулер"</string>
     <string name="system_speech" msgid="8128688499687306982">"Сөз"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Кірістер"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Арнайы мүмкіндіктер"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Жүйе жаңартуы"</string>
     <string name="about_preference" msgid="4131396784531360434">"Туралы"</string>
     <string name="device_name" msgid="2670488158531273028">"Құрылғы атауы"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Қайта бастау"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Құқықтық ақпарат"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Кепілдік"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Ашық бастапқы код лицензиялары"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Қызмет көрсету шарттарын көру"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Құпиялық саясатын көру"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Қосымша шарттарды көру"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google құқықтық ақпараты"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Лицензия деректері қол жетімді емес"</string>
     <string name="about_model" msgid="6625269442206323995">"Үлгі"</string>
     <string name="about_version" msgid="1177287676732287266">"Нұсқа"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Күні"</string>
     <string name="system_time" msgid="6726022312605226285">"Уақыт"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Күнді орнату"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Деректер пішімін таңдау"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Уақытты орнату"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Уақыт белдеуін орнату"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24 сағаттық пішімді пайдалану"</string>
diff --git a/Settings/res/values-km-rKH-notouch/strings.xml b/Settings/res/values-km-rKH-notouch/strings.xml
index c63ef8d..f3c0b2f 100644
--- a/Settings/res/values-km-rKH-notouch/strings.xml
+++ b/Settings/res/values-km-rKH-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"បើ​អ្នក​បង្ខំ​ឲ្យ​កម្មវិធី​ឈប់ វា​អាច​​ដំណើរ​មិន​ត្រឹមត្រូវ។"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"លុប​ចេញ"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"តើ​អ្នក​ចង់​លុប​កម្មវិធី​នេះ​មែនទេ?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"បិទដំណើរការ"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"តើអ្នកចង់បិទដំណើរការកម្មវិធីនេះទេ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"បើកដំណើរការ"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"តើអ្នកចង់បើកដំណើរការកម្មវិធីនេះទេ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"សម្អាត​ទិន្នន័យ"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ទិន្នន័យ​របស់​កម្មវិធី​នេះ​ទាំងអស់​នឹង​ត្រូវ​លុបចេញ​ជា​រៀង​រហូត។"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"នេះ​រួមមាន​ឯកសារ​ ការ​កំណត់ គណនី មូលដ្ឋាន​ទិន្នន័យ​ទាំងអស់។ល។"</string>
@@ -34,7 +38,7 @@
     <string name="device_apps_app_management_clear_default_none" msgid="6312021202504995474">"មិន​មាន​លំនាំដើម​បាន​កំណត់"</string>
     <string name="device_apps_app_management_clear_cache" msgid="7878530504449821203">"សម្អាត​ឃ្លាំង"</string>
     <string name="device_apps_app_management_notifications" msgid="7069935222112158478">"ការ​ជូនដំណឹង"</string>
-    <string name="device_apps_app_management_permissions" msgid="5758303833496289673">"សិទ្ធិ​"</string>
+    <string name="device_apps_app_management_permissions" msgid="5758303833496289673">"សិទ្ធិ"</string>
     <string name="settings_ok" msgid="5501301223475616254">"យល់ព្រម"</string>
     <string name="settings_cancel" msgid="1649053173330804917">"បោះបង់"</string>
     <string name="settings_on" msgid="1295064657786011878">"បើក"</string>
diff --git a/Settings/res/values-km-rKH/strings.xml b/Settings/res/values-km-rKH/strings.xml
index 3dcbabb..0273afc 100644
--- a/Settings/res/values-km-rKH/strings.xml
+++ b/Settings/res/values-km-rKH/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"​បម្រុង​ទុក &amp; ស្ដារ​ឡើង​វិញ"</string>
     <string name="device_reset" msgid="2827002349560023125">"កំណត់​ឡើងវិញ​​ទិន្នន័យ​ដូច​ប្រភព​ដើម"</string>
     <string name="device_calibration" msgid="8632962533376605191">"ការ​ក្រិត​តាម​ខ្នាត"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"កម្មវិធី​​បាន​ទាញ​យក"</string>
     <string name="apps_system" msgid="2499191125802829425">"កម្មវិធី​ប្រព័ន្ធ"</string>
     <string name="apps_running" msgid="6430310491739956228">"កម្មវិធី​កំពុង​ដំណើរការ"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ភាសា"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"ក្ដារចុច"</string>
     <string name="system_search" msgid="2837264654143247611">"ស្វែងរក"</string>
-    <string name="system_security" msgid="4190058778883258927">"សន្តិសុខ &amp;amp​; ការ​ដាក់​កម្រិត"</string>
+    <string name="system_security" msgid="8230080273993484407">"សុវត្ថិភាព &amp; ការ​ដាក់​កម្រិត"</string>
     <string name="system_speech" msgid="8128688499687306982">"និយាយ"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ចូល"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ភាព​ងាយស្រួល"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"ធ្វើ​បច្ចុប្បន្នភាព​ប្រព័ន្ធ​"</string>
     <string name="about_preference" msgid="4131396784531360434">"អំពី"</string>
     <string name="device_name" msgid="2670488158531273028">"ឈ្មោះ​ឧបករណ៍"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"ចាប់ផ្ដើមឡើងវិញ"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"ព័ត៌មាន​ស្រប​​ច្បាប់"</string>
     <string name="about_warranty" msgid="5736003473060436384">"ការ​ធានា​"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"អាជ្ញាប័ណ្ណ​កម្មវិធី​ប្រភព​កូដ​ចំហ"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"មើល​ល័ក្ខខ័ណ្ឌ​​ប្រើ​ប្រាស់"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"មើល​គោលនយោបាយ​ភាព​ឯកជន"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"មើល​លក្ខខណ្ឌ​បន្ថែម"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"ផ្នែកច្បាប់ Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"មិន​មាន​ទិន្នន័យ​អាជ្ញាប័ណ្ណ​ទេ"</string>
     <string name="about_model" msgid="6625269442206323995">"ម៉ូដែល"</string>
     <string name="about_version" msgid="1177287676732287266">"កំណែ"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"កាលបរិច្ឆេទ"</string>
     <string name="system_time" msgid="6726022312605226285">"ពេលវេលា"</string>
     <string name="system_set_date" msgid="2437586307768561116">"កំណត់​កាលបរិច្ឆេទ"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"ជ្រើស​ទ្រង់ទ្រាយ​កាល​បរិច្ឆេទ"</string>
     <string name="system_set_time" msgid="4661804115501057452">"កំណត់​ពេលវេលា"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"កំណត់​តំបន់​ពេលវេលា"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"ប្រើ​ទ្រង់ទ្រាយ ២៤ ម៉ោង"</string>
diff --git a/Settings/res/values-kn-rIN-notouch/strings.xml b/Settings/res/values-kn-rIN-notouch/strings.xml
index 25d152d..52128a8 100644
--- a/Settings/res/values-kn-rIN-notouch/strings.xml
+++ b/Settings/res/values-kn-rIN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಬಲವಂತವಾಗಿ ನಿಲ್ಲಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"ಅಸ್ಥಾಪಿಸು"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಅಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ಡೇಟಾ ತೆರವುಗೊಳಿಸು"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ಈ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ಇದು ಎಲ್ಲ ಫೈಲ್‌ಗಳು, ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಖಾತೆಗಳು, ಡೇಟಾಬೇಸ್‌ಗಳು, ಮುಂತಾದವುಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
diff --git a/Settings/res/values-kn-rIN/strings.xml b/Settings/res/values-kn-rIN/strings.xml
index 879a284..1bb7d1f 100644
--- a/Settings/res/values-kn-rIN/strings.xml
+++ b/Settings/res/values-kn-rIN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ಬ್ಯಾಕಪ್ &amp; ಮರುಸ್ಥಾಪನೆ"</string>
     <string name="device_reset" msgid="2827002349560023125">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ"</string>
     <string name="device_calibration" msgid="8632962533376605191">"ಕ್ಯಾಲಿಬರೇಶನ್"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="apps_system" msgid="2499191125802829425">"ಸಿಸ್ಟಂ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="apps_running" msgid="6430310491739956228">"ರನ್ ಆಗುತ್ತಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ಭಾಷೆ"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"ಕೀಬೋರ್ಡ್"</string>
     <string name="system_search" msgid="2837264654143247611">"ಹುಡುಕಾಟ"</string>
-    <string name="system_security" msgid="4190058778883258927">"ಭದ್ರತೆ &amp; ನಿರ್ಬಂಧಗಳು"</string>
+    <string name="system_security" msgid="8230080273993484407">"ಭದ್ರತೆ &amp; ನಿರ್ಬಂಧಗಳು"</string>
     <string name="system_speech" msgid="8128688499687306982">"ಮಾತು"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ಇನ್‌ಪುಟ್‌ಗಳು"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"ಸಿಸ್ಟಂ ನವೀಕರಣ"</string>
     <string name="about_preference" msgid="4131396784531360434">"ಕುರಿತು"</string>
     <string name="device_name" msgid="2670488158531273028">"ಸಾಧನದ ಹೆಸರು"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"ಮರುಪ್ರಾರಂಭಿಸು"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
     <string name="about_warranty" msgid="5736003473060436384">"ವಾರೆಂಟಿ"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"ಸೇವಾ ನಿಯಮಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"ಗೌಪ್ಯತೆ ನೀತಿಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"ಹೆಚ್ಚುವರಿ ನಿಯಮಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google ಕಾನೂನು"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"ಪರವಾನಗಿ ಡೇಟಾ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="about_model" msgid="6625269442206323995">"ಮಾದರಿ"</string>
     <string name="about_version" msgid="1177287676732287266">"ಆವೃತ್ತಿ"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"ದಿನಾಂಕ"</string>
     <string name="system_time" msgid="6726022312605226285">"ಸಮಯ"</string>
     <string name="system_set_date" msgid="2437586307768561116">"ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"ದಿನಾಂಕ ಸ್ವರೂಪವನ್ನು ಆರಿಸಿ"</string>
     <string name="system_set_time" msgid="4661804115501057452">"ಸಮಯವನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"ಸಮಯದ ವಲಯವನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-ಗಂಟೆ ಸ್ವರೂಪವನ್ನು ಬಳಸು"</string>
diff --git a/Settings/res/values-ko-notouch/strings.xml b/Settings/res/values-ko-notouch/strings.xml
index a4e40a0..8cc9afa 100644
--- a/Settings/res/values-ko-notouch/strings.xml
+++ b/Settings/res/values-ko-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"강제로 앱을 종료하면 예기치 않은 오류가 발생할 수 있습니다."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"제거"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"이 앱을 제거하시겠습니까?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"사용 중지"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"이 앱을 사용 중지하시겠습니까?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"사용"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"이 앱을 사용 설정하시겠습니까?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"데이터 삭제"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"이 앱의 모든 데이터가 완전히 삭제됩니다."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"모든 파일, 설정, 계정, 데이터베이스 등이 포함됩니다."</string>
diff --git a/Settings/res/values-ko/strings.xml b/Settings/res/values-ko/strings.xml
index 0cd17ed..2684536 100644
--- a/Settings/res/values-ko/strings.xml
+++ b/Settings/res/values-ko/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"백업 및 복원"</string>
     <string name="device_reset" msgid="2827002349560023125">"초기화"</string>
     <string name="device_calibration" msgid="8632962533376605191">"보정"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"다운로드한 앱"</string>
     <string name="apps_system" msgid="2499191125802829425">"시스템 앱"</string>
     <string name="apps_running" msgid="6430310491739956228">"실행 중인 앱"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"언어"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"키보드"</string>
     <string name="system_search" msgid="2837264654143247611">"검색"</string>
-    <string name="system_security" msgid="4190058778883258927">"보안 및 제한"</string>
+    <string name="system_security" msgid="8230080273993484407">"보안 및 제한"</string>
     <string name="system_speech" msgid="8128688499687306982">"음성"</string>
     <string name="system_inputs" msgid="2413907183796651102">"입력"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"접근성"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"시스템 업데이트"</string>
     <string name="about_preference" msgid="4131396784531360434">"정보"</string>
     <string name="device_name" msgid="2670488158531273028">"기기 이름"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"다시 시작"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"법적 정보"</string>
     <string name="about_warranty" msgid="5736003473060436384">"품질 보증"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"오픈소스 라이선스"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"서비스 약관 보기"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"개인정보취급방침 보기"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"추가 약관 보기"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google 법적 고지"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"라이선스 데이터를 사용할 수 없습니다."</string>
     <string name="about_model" msgid="6625269442206323995">"모델"</string>
     <string name="about_version" msgid="1177287676732287266">"버전"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"날짜"</string>
     <string name="system_time" msgid="6726022312605226285">"시간"</string>
     <string name="system_set_date" msgid="2437586307768561116">"날짜 설정"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"날짜 형식 선택"</string>
     <string name="system_set_time" msgid="4661804115501057452">"시간 설정"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"시간대 설정"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24시간 형식 사용"</string>
diff --git a/Settings/res/values-ky-rKG-notouch/strings.xml b/Settings/res/values-ky-rKG-notouch/strings.xml
index c25cf55..3c46793 100644
--- a/Settings/res/values-ky-rKG-notouch/strings.xml
+++ b/Settings/res/values-ky-rKG-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Эгер колдонмону күч менен токтотсоңуз, ал туура эмес иштеп калышы мүмкүн."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Орнотуудан чыгаруу"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Бул колдонмону орнотуудан чыгарасызбы?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Өчүрүү"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Бул колдонмону өчүргүңүз келеби?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Иштетүү"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Бул колдонмону иштеткиңиз келеби?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Дайындарды тазалоо"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Бул колдонмонун бардык дайындары биротоло өчүрүлөт."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Алардын катарына файлдар, жөндөөлөр, каттоо эсептери, дайындар базалары ж.б. кирет."</string>
diff --git a/Settings/res/values-ky-rKG/strings.xml b/Settings/res/values-ky-rKG/strings.xml
index 2bb7ebf..0df0a1d 100644
--- a/Settings/res/values-ky-rKG/strings.xml
+++ b/Settings/res/values-ky-rKG/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Камдык көчүрмө жана калыбына келтирүү"</string>
     <string name="device_reset" msgid="2827002349560023125">"Демейки дайындарга кайтаруу"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калибрдөө аяктады"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Жүктөлгөн колдонмолор"</string>
     <string name="apps_system" msgid="2499191125802829425">"Тутум колдонмолору"</string>
     <string name="apps_running" msgid="6430310491739956228">"Иштеп жаткан колдонмолор"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Тил"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Баскычтоп"</string>
     <string name="system_search" msgid="2837264654143247611">"Издөө"</string>
-    <string name="system_security" msgid="4190058778883258927">"Коопсуздук &amp; Чектөөлөр"</string>
+    <string name="system_security" msgid="8230080273993484407">"Коопсуздук &amp; чектөөлөр"</string>
     <string name="system_speech" msgid="8128688499687306982">"Кеп"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Киргизүүлөр"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Өзгөчө мүмкүнчүлүктөр"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Тутум жаңыртуусу"</string>
     <string name="about_preference" msgid="4131396784531360434">"Жөнүндө"</string>
     <string name="device_name" msgid="2670488158531273028">"Түзмөктүн аталышы"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Кайра баштоо"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Юридикалык маалыматтар"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Кепилдик"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Ачык программа уруксаттамалары"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Тейлөө шарттарын карап көрүү"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Купуялуулук саясатын карап көрүү"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Кошумча шарттарды карап көрүү"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google юридикалык жобосу"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Уруксаттаманын дайындары жеткиликтүү эмес"</string>
     <string name="about_model" msgid="6625269442206323995">"Үлгүсү"</string>
     <string name="about_version" msgid="1177287676732287266">"Версиясы"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Дата"</string>
     <string name="system_time" msgid="6726022312605226285">"Убакыт"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Күн коюу"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Датанын форматын тандоо"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Убакытты коюу"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Убакыт алкагын коюу"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24 сааттык форматты колдонуу"</string>
diff --git a/Settings/res/values-lo-rLA-notouch/strings.xml b/Settings/res/values-lo-rLA-notouch/strings.xml
index 5045618..30135f7 100644
--- a/Settings/res/values-lo-rLA-notouch/strings.xml
+++ b/Settings/res/values-lo-rLA-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"ຫານທ່ານບັງຄັບປິດແອັບຯໃດນຶ່ງ, ມັນອາດເຮັດວຽກຜິດປົກກະຕິໄດ້."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"ຖອນ​ການ​ຕິດ​ຕັ້ງ"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"​ທ່ານ​ຕ້ອງ​ການ​ຖອນ​ການ​ຕິດ​ຕັ້ງ​ແອັບຯ​ນີ້ຫຼື​ບໍ່?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"ປິດໃຊ້​ງານ"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"ທ່ານ​ຕ້ອງ​ການ​ປິດ​ໃຊ້​ງານ​ແອັບ​ນີ້​ບໍ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"ເປີດໃຊ້ງານ"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"ທ່ານ​ຕ້ອງ​ການ​ເປີດ​ໃຊ້​ງານ​ແອັບ​ນີ້​ບໍ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ລຶບຂໍ້ມູນ"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"​ຂໍ້​ມູນ​ທັງ​ໝົດ​ຂອງ​ແອັບຯ​ນີ້​ຈະ​ຖືກ​ລຶບ​ອອກ​ຖ​າ​ວອນ."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ນີ້​ຮວ​ມ​ໄປ​ເຖິງ​ໄຟ​ລ໌​ທັງ​ໝົດ, ການ​ຕັ້ງ​ຄ່າ, ບັນ​ຊີ, ຖານ​ຂໍ້​ມູນ ແລະ​ອື່ນໆ."</string>
diff --git a/Settings/res/values-lo-rLA/strings.xml b/Settings/res/values-lo-rLA/strings.xml
index 78f0f46..2805a24 100644
--- a/Settings/res/values-lo-rLA/strings.xml
+++ b/Settings/res/values-lo-rLA/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ການສຳຮອງ &amp; ການກູ້ຂໍ້ມູນ"</string>
     <string name="device_reset" msgid="2827002349560023125">"ຣີເຊັດຄ່າຈາກໂຮງງານ"</string>
     <string name="device_calibration" msgid="8632962533376605191">"ການ​ປັບ​ທຽບ"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"​ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ແລ້ວ"</string>
     <string name="apps_system" msgid="2499191125802829425">"ແອັບຯລະບົບ"</string>
     <string name="apps_running" msgid="6430310491739956228">"​ແອັບຯ​ທີ່​​ເຮັດ​ວຽກ​ຢູ່"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ພາສາ"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"ແປ້ນ​ພິມ"</string>
     <string name="system_search" msgid="2837264654143247611">"ຊອກຫາ"</string>
-    <string name="system_security" msgid="4190058778883258927">"ຄວາມປອດໄພ &amp; ການຈຳກັດ"</string>
+    <string name="system_security" msgid="8230080273993484407">"ຄວາມປອດໄພ &amp; ການຈຳກັດ"</string>
     <string name="system_speech" msgid="8128688499687306982">"ການ​​ເວົ້າ"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ອິນພຸດ"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ການຊ່ວຍເຂົ້າເຖິງ"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"ການອັບເດດລະບົບ"</string>
     <string name="about_preference" msgid="4131396784531360434">"ກ່ຽວກັບ"</string>
     <string name="device_name" msgid="2670488158531273028">"ຊື່​ອຸ​ປະ​ກອນ"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"ຣີສະຕາດ"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"​ຂໍ້​ມູນ​ທາງ​ກົດ​ໝາຍ"</string>
     <string name="about_warranty" msgid="5736003473060436384">"​ການ​ຮັບ​ປະ​ກັນ"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"​ລິ​ຂະ​ສິດ​ໂອ​ເພນ​ຊອດ"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"​ເບິ່ງ​ເງື່ອນ​ໄຂ​ການ​ໃຫ້​ບໍ​ລິ​ການ"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"​ເບິ່ງ​ນະ​ໂຍ​ບາຍ​ຄວາມ​ເປັນ​ສ່ວນ​ໂຕ"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"ເບິ່ງ​ຂໍ້​ກຳ​ນົດ​ເພີ່ມ​ເຕີມ"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google ຕາມ​ກົດ​ໝາຍ"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"ບໍ່​ມີ​ຂໍ້​ມູນ​ລິ​ຂະ​ສິດ"</string>
     <string name="about_model" msgid="6625269442206323995">"ໂມເດວ"</string>
     <string name="about_version" msgid="1177287676732287266">"ເວີຊັນ"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"ວັນທີ"</string>
     <string name="system_time" msgid="6726022312605226285">"ເວລາ"</string>
     <string name="system_set_date" msgid="2437586307768561116">"ຕັ້ງວັນທີ"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"ເລືອກຮູບແບບວັນທີ"</string>
     <string name="system_set_time" msgid="4661804115501057452">"ກໍານົດເວລາ"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"​ຕັ້ງເຂດເວລາ"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"ໃຊ້ຮູບແບບ 24 ຊົ່ວໂມງ"</string>
diff --git a/Settings/res/values-lt-notouch/strings.xml b/Settings/res/values-lt-notouch/strings.xml
index d7d24a8..33d2329 100644
--- a/Settings/res/values-lt-notouch/strings.xml
+++ b/Settings/res/values-lt-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Jei priverstinai sustabdysite programą, ji gali veikti netinkamai."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Pašalinti"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Ar norite pašalinti šią programą?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Išjungti"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Ar norite išjungti šią programą?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Įgalinti"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Ar norite įgalinti šią programą?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Išvalyti duomenis"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Visi šios programos duomenys bus ištrinti negrįžtamai."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Įskaitant visus failus, nustatymus, paskyras, duomenų bazes ir t. t."</string>
diff --git a/Settings/res/values-lt/strings.xml b/Settings/res/values-lt/strings.xml
index 3839337..f5514f3 100644
--- a/Settings/res/values-lt/strings.xml
+++ b/Settings/res/values-lt/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Kurti atsarginę kopiją ir atkurti"</string>
     <string name="device_reset" msgid="2827002349560023125">"Gamyklinių duomenų atkūrimas"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibravimas"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Atsisiųstos programos"</string>
     <string name="apps_system" msgid="2499191125802829425">"Sistemos programos"</string>
     <string name="apps_running" msgid="6430310491739956228">"Vykdomos programos"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Kalba"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Klaviatūra"</string>
     <string name="system_search" msgid="2837264654143247611">"Paieška"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sauga ir apribojimai"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sauga ir apribojimai"</string>
     <string name="system_speech" msgid="8128688499687306982">"Šneka"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Įvestys"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Pritaikymas neįgaliesiems"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Sistemos naujinys"</string>
     <string name="about_preference" msgid="4131396784531360434">"Apie"</string>
     <string name="device_name" msgid="2670488158531273028">"Įrenginio pavadinimas"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Paleisti iš naujo"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Teisinė informacija"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantija"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Atvirojo šaltinio licencijos"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Peržiūrėti paslaugų teikimo sąlygas"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Peržiūrėti privatumo politiką"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Peržiūrėti papildomas sąlygas"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Teisinė „Google“ informacija"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licencijos duomenys negalimi"</string>
     <string name="about_model" msgid="6625269442206323995">"Modelis"</string>
     <string name="about_version" msgid="1177287676732287266">"Versija"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Laikas"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Nustatyti datą"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Pasirinkite datos formatą"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Nustatyti laiką"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Nustatyti laiko juostą"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Naudoti 24 val. formatą"</string>
diff --git a/Settings/res/values-lv-notouch/strings.xml b/Settings/res/values-lv-notouch/strings.xml
index b35256d..e93419f 100644
--- a/Settings/res/values-lv-notouch/strings.xml
+++ b/Settings/res/values-lv-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Piespiedu kārtā apturot lietotnes darbību, var rasties lietotnes darbības traucējumi."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Atinstalēt"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Vai vēlaties atinstalēt šo lietotni?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Atspējot"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Vai vēlaties atspējot šo lietotni?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Iespējot"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Vai vēlaties iespējot šo lietotni?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Notīrīt datus"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Visi šīs lietotnes dati tiks neatgriezeniski dzēsti."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Tas ietver visus failus, iestatījumus, kontus, datu bāzes utt."</string>
diff --git a/Settings/res/values-lv/strings.xml b/Settings/res/values-lv/strings.xml
index 180d171..37570c1 100644
--- a/Settings/res/values-lv/strings.xml
+++ b/Settings/res/values-lv/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Dublēšana un atjaunošana"</string>
     <string name="device_reset" msgid="2827002349560023125">"Rūpnīcas datu atiestatīšana"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrēšana"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Lejupielādētās lietotnes"</string>
     <string name="apps_system" msgid="2499191125802829425">"Sistēmas lietotnes"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aktīvās lietotnes"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Valoda"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tastatūra"</string>
     <string name="system_search" msgid="2837264654143247611">"Meklēšana"</string>
-    <string name="system_security" msgid="4190058778883258927">"Drošība un ierobežojumi"</string>
+    <string name="system_security" msgid="8230080273993484407">"Drošība un ierobežojumi"</string>
     <string name="system_speech" msgid="8128688499687306982">"Runa"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Ieejas"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Pieejamība"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Sistēmas atjauninājums"</string>
     <string name="about_preference" msgid="4131396784531360434">"Par"</string>
     <string name="device_name" msgid="2670488158531273028">"Ierīces nosaukums"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Restartēt"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Juridiskā informācija"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantija"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Atklātā pirmkoda licences"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Skatīt pakalpojumu sniegšanas noteikumus"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Skatīt konfidencialitātes politiku"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Skatīt papildu noteikumus"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google juridiskā informācija"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Dati par licenci nav pieejami."</string>
     <string name="about_model" msgid="6625269442206323995">"Modelis"</string>
     <string name="about_version" msgid="1177287676732287266">"Versija"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datums"</string>
     <string name="system_time" msgid="6726022312605226285">"Laiks"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Datuma iestatīšana"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Datuma formāta izvēle"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Laika iestatīšana"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Laika joslas iestatīšana"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Izmantot 24 stundu formātu"</string>
diff --git a/Settings/res/values-mk-rMK-notouch/strings.xml b/Settings/res/values-mk-rMK-notouch/strings.xml
index d5a6be0..a616435 100644
--- a/Settings/res/values-mk-rMK-notouch/strings.xml
+++ b/Settings/res/values-mk-rMK-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ако присилно запрете апликација, таа може да не се однесува правилно."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Деинсталирај"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Дали сакате да ја деинсталирате оваа апликација?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Оневозможи"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Дали сакате да ја оневозможите оваа апликација?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Овозможи"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Дали сакате да ја овозможите оваа апликација?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Исчисти податоци"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Сите податоци на оваа апликација ќе се избришат трајно."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Ова ги вклучува сите датотеки, поставки, сметки, бази на податоци, итн."</string>
diff --git a/Settings/res/values-mk-rMK/strings.xml b/Settings/res/values-mk-rMK/strings.xml
index 97ce090..764c32b 100644
--- a/Settings/res/values-mk-rMK/strings.xml
+++ b/Settings/res/values-mk-rMK/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Направи резервна копија и обнови"</string>
     <string name="device_reset" msgid="2827002349560023125">"Фабричко ресетирање на податоци"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калибрација"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Преземени апликации"</string>
     <string name="apps_system" msgid="2499191125802829425">"Системски апликации"</string>
     <string name="apps_running" msgid="6430310491739956228">"Активни апликации"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Јазик"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Тастатура"</string>
     <string name="system_search" msgid="2837264654143247611">"Пребарување"</string>
-    <string name="system_security" msgid="4190058778883258927">"Безбедност и ограничувања"</string>
+    <string name="system_security" msgid="8230080273993484407">"Безбедност и ограничувања"</string>
     <string name="system_speech" msgid="8128688499687306982">"Говор"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Влезови"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Пристапност"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Ажурирање на системот"</string>
     <string name="about_preference" msgid="4131396784531360434">"За"</string>
     <string name="device_name" msgid="2670488158531273028">"Име на уред"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Рестартирај"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Правни информации"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Гаранција"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Лиценци со отворен код"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Прикажи ги Условите на користење"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Прикажи ја Политиката за безбедност"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Прикажи ги дополнителните услови"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Правни работи на Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Податоците за лиценцата се недостапни"</string>
     <string name="about_model" msgid="6625269442206323995">"Модел"</string>
     <string name="about_version" msgid="1177287676732287266">"Верзија"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Датум"</string>
     <string name="system_time" msgid="6726022312605226285">"Време"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Постави датум"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Избери формат на датум"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Постави време"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Постави временска зона"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Користи 24-часовен формат"</string>
diff --git a/Settings/res/values-ml-rIN-notouch/strings.xml b/Settings/res/values-ml-rIN-notouch/strings.xml
index 3295576..64ef839 100644
--- a/Settings/res/values-ml-rIN-notouch/strings.xml
+++ b/Settings/res/values-ml-rIN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"നിങ്ങൾ ഒരു അപ്ലിക്കേഷൻ നിർബന്ധിതമായി നിർത്തിയാൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"അൺഇൻസ്റ്റാളുചെയ്യുക"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"ഈ അപ്ലിക്കേഷൻ അൺഇൻസ്റ്റാളുചെയ്യണോ?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"നിങ്ങൾക്ക് ഈ അപ്ലിക്കേഷൻ പ്രവർത്തനരഹിതമാക്കണോ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"നിങ്ങൾക്ക് ഈ അപ്ലിക്കേഷൻ പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ഡാറ്റ മായ്‌ക്കുക"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ഈ അപ്ലിക്കേഷന്റെ എല്ലാ ഡാറ്റയും ശാശ്വതമായി ഇല്ലാതാക്കും."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ഫയലുകൾ, ക്രമീകരണങ്ങൾ, അക്കൗണ്ടുകൾ, ഡാറ്റാബേസുകൾ തുടങ്ങിയവയെല്ലാം ഇതിൽ ഉൾപ്പെടുന്നു."</string>
diff --git a/Settings/res/values-ml-rIN/strings.xml b/Settings/res/values-ml-rIN/strings.xml
index 4973464..fd9944e 100644
--- a/Settings/res/values-ml-rIN/strings.xml
+++ b/Settings/res/values-ml-rIN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ബാക്കപ്പുചെയ്യലും പുനഃസ്ഥാപിക്കലും"</string>
     <string name="device_reset" msgid="2827002349560023125">"ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം"</string>
     <string name="device_calibration" msgid="8632962533376605191">"കാലിബ്രേഷൻ"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"ഡൗൺലോഡുചെയ്ത അപ്ലിക്കേഷനുകൾ"</string>
     <string name="apps_system" msgid="2499191125802829425">"സിസ്‌റ്റം അപ്ലിക്കേഷനുകൾ"</string>
     <string name="apps_running" msgid="6430310491739956228">"പ്രവർത്തിക്കുന്ന അപ്ലിക്കേഷനുകൾ"</string>
@@ -74,7 +78,7 @@
     <string name="accessory_unpair" msgid="8242725516604465355">"ജോടിയാക്കിയത് മാറ്റുക"</string>
     <string name="accessory_unpairing" msgid="7568241162181184667">"ഉപകരണം ജോടിയാക്കിയത് മാറ്റുന്നു…"</string>
     <string name="accessory_connected" msgid="2156489304110030393">"കണക്‌റ്റുചെയ്‌തു"</string>
-    <string name="accessories_add_title" msgid="6940361421891873321">"ആക്‌‌സ്സസറികൾക്കായി തിരയുന്നു…"</string>
+    <string name="accessories_add_title" msgid="6940361421891873321">"ആക്‌‌സ്സസറികൾക്ക് തിരയുന്നു…"</string>
     <string name="accessories_add_bluetooth_inst" msgid="5892952745770640383">"നിങ്ങളുടെ ബ്ലൂടൂത്ത് ഉപകരണങ്ങൾ ജോടിയാക്കുന്നതിനു മുമ്പ്, അവ ജോടിയാക്കൽ മോഡിലാണ് ഉള്ളതെന്ന് ഉറപ്പുവരുത്തുക"</string>
     <string name="accessories_autopair_msg" msgid="8618829246837821752">"ഒരു ഉപകരണം കണ്ടെത്തി, അത് <xliff:g id="COUNTDOWN">%1$s</xliff:g> സെക്കന്റിനുള്ളിൽ യാന്ത്രികമായി ജോടിയാകും"</string>
     <string name="accessories_add_title_multiple" msgid="8455249961819802466">"ഒന്നിലധികം ഉപകരണങ്ങൾ കണ്ടെത്തി"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ഭാഷ"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"കീബോർഡ്"</string>
     <string name="system_search" msgid="2837264654143247611">"തിരയുക"</string>
-    <string name="system_security" msgid="4190058778883258927">"സുരക്ഷയും നിയന്ത്രണങ്ങളും"</string>
+    <string name="system_security" msgid="8230080273993484407">"സുരക്ഷയും നിയന്ത്രണങ്ങളും"</string>
     <string name="system_speech" msgid="8128688499687306982">"സംഭാഷണം"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ഇൻപുട്ടുകൾ"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"പ്രവേശനക്ഷമത"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"സിസ്റ്റം അപ്ഡേറ്റ്"</string>
     <string name="about_preference" msgid="4131396784531360434">"ആമുഖം"</string>
     <string name="device_name" msgid="2670488158531273028">"ഉപകരണത്തിന്റെ പേര്"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"പുനരാരംഭിക്കുക"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"നിയമ വിവരം"</string>
     <string name="about_warranty" msgid="5736003473060436384">"വാറന്റി"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"സേവന നിബന്ധനകൾ കാണുക"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"സ്വകാര്യതാ നയം കാണുക"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"അധിക നിബന്ധനകൾ കാണുക"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google ലീഗൽ"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"ലൈസൻസ് ഡാറ്റ ലഭ്യമല്ല"</string>
     <string name="about_model" msgid="6625269442206323995">"മോഡല്‍"</string>
     <string name="about_version" msgid="1177287676732287266">"പതിപ്പ്"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"തീയതി"</string>
     <string name="system_time" msgid="6726022312605226285">"സമയം"</string>
     <string name="system_set_date" msgid="2437586307768561116">"തീയതി സജ്ജീകരിക്കുക"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"തീയതി ഫോർമാറ്റ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="system_set_time" msgid="4661804115501057452">"സമയം സജ്ജീകരിക്കുക"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"സമയ മേഖല സജ്ജീകരിക്കുക"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24 മണിക്കൂർ ഫോർമാറ്റ് ഉപയോഗിക്കുക"</string>
diff --git a/Settings/res/values-mn-rMN-notouch/strings.xml b/Settings/res/values-mn-rMN-notouch/strings.xml
index 31f6ac0..15a3b7d 100644
--- a/Settings/res/values-mn-rMN-notouch/strings.xml
+++ b/Settings/res/values-mn-rMN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Хэрэв апп-г хүчээр зогсоовол буруу ажиллаж магадгүй."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Устгах"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Та энэ апп-г устгамаар байна уу?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Идэвхгүй болгох"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Та энэ апликейшнийг идэвхгүй болгомоор байна уу?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Идэвхжүүлэх"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Та энэ апликейшнийг идэвхтэй болгомоор байна уу?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Датаг арилгах"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Энэ бүх апп дата бүрмөсөн устах болно."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Үүнд бүх файл, тохиргоо, акаунт, датабааз гэх мэт орно."</string>
diff --git a/Settings/res/values-mn-rMN/strings.xml b/Settings/res/values-mn-rMN/strings.xml
index 8776731..a635675 100644
--- a/Settings/res/values-mn-rMN/strings.xml
+++ b/Settings/res/values-mn-rMN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Нөөшлөх &amp; сэргээх"</string>
     <string name="device_reset" msgid="2827002349560023125">"Үйлдвэрийн утга олголт"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Тааруулалт"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Татаж авсан апп-ууд"</string>
     <string name="apps_system" msgid="2499191125802829425">"Системийн апп-ууд"</string>
     <string name="apps_running" msgid="6430310491739956228">"Ажиллаж байгаа апп-ууд"</string>
@@ -74,7 +78,7 @@
     <string name="accessory_unpair" msgid="8242725516604465355">"Үл хослуулах"</string>
     <string name="accessory_unpairing" msgid="7568241162181184667">"Төхөөрөмжийг хослолыг болиулах ..."</string>
     <string name="accessory_connected" msgid="2156489304110030393">"Холбогдсон"</string>
-    <string name="accessories_add_title" msgid="6940361421891873321">"Дагалдах төхөрөөмжүүдийг хайж байна ..."</string>
+    <string name="accessories_add_title" msgid="6940361421891873321">"Дагалдах хэрэгслүүдийг хайж байна ..."</string>
     <string name="accessories_add_bluetooth_inst" msgid="5892952745770640383">"Өөрийн Блютүүт төхөөрөмжүүдийг хослуулахын өмнө хослуулах горимд байгаа эсэхийг шалгана уу"</string>
     <string name="accessories_autopair_msg" msgid="8618829246837821752">"Төхөөрөмж олдлоо, <xliff:g id="COUNTDOWN">%1$s</xliff:g> секундын дараа автоматаар хослуулагдах болно"</string>
     <string name="accessories_add_title_multiple" msgid="8455249961819802466">"Олон төхөөрөмжүүд олдлоо"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Хэл"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Гар"</string>
     <string name="system_search" msgid="2837264654143247611">"Хайх"</string>
-    <string name="system_security" msgid="4190058778883258927">"Аюулгүй байдал &amp; Хязгаарлалтууд"</string>
+    <string name="system_security" msgid="8230080273993484407">"Аюулгүй байдлын &amp; хязгаарлалт"</string>
     <string name="system_speech" msgid="8128688499687306982">"Яриа"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Оролт"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Хандалт"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Системийн шинэчлэлт"</string>
     <string name="about_preference" msgid="4131396784531360434">"Тухай"</string>
     <string name="device_name" msgid="2670488158531273028">"Төхөөрөмжийн нэр"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Дахин эхлүүлэх"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Хууль эрх зүйн мэдээлэл"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Баталгаа"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Нээлттэй эхийн лиценз"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Үйлчилгээний нөхцөлийг үзэх"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Нууцлалын бодлогыг үзэх"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Нэмэлт Үйлчилгээний Нөхцөл харах"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google-ийн хууль эрх зүйн"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Лицензийн мэдээлэл байхгүй байна"</string>
     <string name="about_model" msgid="6625269442206323995">"Модел"</string>
     <string name="about_version" msgid="1177287676732287266">"Хувилбар"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Огноо"</string>
     <string name="system_time" msgid="6726022312605226285">"Хугацаа"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Огноо тохируулах"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Огнооны форматыг сонгох"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Цаг тохируулах"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Цагийн бүсийн тохиргоо"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24 цагийн формат ашиглах"</string>
diff --git a/Settings/res/values-mr-rIN-notouch/strings.xml b/Settings/res/values-mr-rIN-notouch/strings.xml
index f029ee0..c344135 100644
--- a/Settings/res/values-mr-rIN-notouch/strings.xml
+++ b/Settings/res/values-mr-rIN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"आपण अॅप थांबविण्याची सक्ती केल्यास, ते गैरवर्तन करू शकते."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"विस्थापित करा"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"आपण हा अॅप विस्थापित करू इच्छिता?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"अक्षम करा"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"आपण हा अॅप अक्षम करू इच्छिता?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"सक्षम करा"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"आपण हा अॅप सक्षम करू इच्छिता?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"डेटा साफ करा"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"या अॅप चा सर्व डेटा कायमचा हटविला जाईल."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"यात सर्व फायली, सेटिंग्ज, खाती, डेटाबेस, इ. समाविष्ट होते"</string>
diff --git a/Settings/res/values-mr-rIN/arrays.xml b/Settings/res/values-mr-rIN/arrays.xml
index f6a1684..7a50bf6 100644
--- a/Settings/res/values-mr-rIN/arrays.xml
+++ b/Settings/res/values-mr-rIN/arrays.xml
@@ -72,10 +72,10 @@
     <item msgid="4410581208185456276">"डीफॉल्ट"</item>
     <item msgid="9033306684422202101">"Sans Serif"</item>
     <item msgid="1864985245839120339">"Sans-serif संक्षिप्त"</item>
-    <item msgid="2707402752636362906">"Sans-serif मोनोस्पेस"</item>
+    <item msgid="2707402752636362906">"Sans-serif monospace"</item>
     <item msgid="4549910217342216388">"Serif"</item>
-    <item msgid="4764344884232052861">"Serif मोनोस्पेस"</item>
-    <item msgid="8561996903323025702">"अनौपचारिक"</item>
+    <item msgid="4764344884232052861">"Serif monospace"</item>
+    <item msgid="8561996903323025702">"Casual"</item>
     <item msgid="8403638572764467550">"Cursive"</item>
     <item msgid="5560655268137500927">"Small capitals"</item>
   </string-array>
@@ -91,7 +91,7 @@
     <item msgid="7663488423233018922">"बाह्यरेखा"</item>
     <item msgid="7891048730741670843">"ड्रॉप शॅडो"</item>
     <item msgid="6613725572146700438">"उन्नत"</item>
-    <item msgid="1007736533206905292">"हताश"</item>
+    <item msgid="1007736533206905292">"दाबलेले"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="7311196539184412021">"25%"</item>
diff --git a/Settings/res/values-mr-rIN/strings.xml b/Settings/res/values-mr-rIN/strings.xml
index c87d66e..6df0a11 100644
--- a/Settings/res/values-mr-rIN/strings.xml
+++ b/Settings/res/values-mr-rIN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"बॅकअप घ्या आणि पुनर्संचयित करा"</string>
     <string name="device_reset" msgid="2827002349560023125">"फॅक्टरी डेटा रीसेट"</string>
     <string name="device_calibration" msgid="8632962533376605191">"कॅलिब्रेशन"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"डाउनलोड केलेले अॅप्स"</string>
     <string name="apps_system" msgid="2499191125802829425">"सिस्टीम अॅप्स"</string>
     <string name="apps_running" msgid="6430310491739956228">"अॅप्स चालविणे"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"सामान्यतः 0000 किंवा 1234"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"जोडा"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"रद्द करा"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google कास्ट"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"तारीख आणि वेळ"</string>
     <string name="system_language" msgid="2337138146114609247">"भाषा"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"कीबोर्ड"</string>
     <string name="system_search" msgid="2837264654143247611">"शोधा"</string>
-    <string name="system_security" msgid="4190058778883258927">"सुरक्षितता आणि निर्बंध"</string>
+    <string name="system_security" msgid="8230080273993484407">"सुरक्षितता आणि प्रतिबंध"</string>
     <string name="system_speech" msgid="8128688499687306982">"उच्चारण"</string>
     <string name="system_inputs" msgid="2413907183796651102">"इनपुट"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"प्रवेशयोग्यता"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"सिस्टम अद्यतन"</string>
     <string name="about_preference" msgid="4131396784531360434">"विषयी"</string>
     <string name="device_name" msgid="2670488158531273028">"डिव्हाइस नाव"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"रीस्टार्ट करा"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"कायदेशीर माहिती"</string>
     <string name="about_warranty" msgid="5736003473060436384">"हमी"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"मुक्त स्त्रोत परवाने"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"सेवा अटी पहा"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"गोपनीयता धोरण पहा"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"अतिरिक्त अटी पहा"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google कायदेशीर"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"परवाना डेटा अनुपलब्‍ध आहे"</string>
     <string name="about_model" msgid="6625269442206323995">"मॉडेल"</string>
     <string name="about_version" msgid="1177287676732287266">"आवृत्ती"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"तारीख"</string>
     <string name="system_time" msgid="6726022312605226285">"वेळ"</string>
     <string name="system_set_date" msgid="2437586307768561116">"तारीख सेट करा"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"तारीख स्वरूपन निवडा"</string>
     <string name="system_set_time" msgid="4661804115501057452">"वेळ सेट करा"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"टाईम झोन सेट करा"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-तास स्वरूप वापरा"</string>
diff --git a/Settings/res/values-ms-notouch/strings.xml b/Settings/res/values-ms-notouch/strings.xml
index 1e4db2f..2790f77 100644
--- a/Settings/res/values-ms-notouch/strings.xml
+++ b/Settings/res/values-ms-notouch/strings.xml
@@ -20,57 +20,6 @@
     <string name="wifi_setup_input_password" msgid="4324884380214448502">"Masukkan kata laluan untuk <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_setup_waiting_for_join" msgid="42826539810553389">"Menyertai ^1"</string>
     <string name="wifi_setup_connection_success" msgid="3362351168182711828">"Berjaya disambungkan!"</string>
-    <string name="setup_ir" msgid="8305193430921797241">"Konfigurasikan kawalan jauh"</string>
-    <string name="remote_setup_welcome_message_description" msgid="9134446428396720516">"Kawalan jauh anda boleh mengawal kuasa, penukaran input dan kelantangan untuk TV atau penerima AV"</string>
-    <string name="remote_setup_welcome_message_hint" msgid="3193005012448600181">"Anda boleh menukar perkara ini selepas ini dalam Tetapan"</string>
-    <string name="remote_setup_welcome_message_choice_yes" msgid="5685232858099010013">"Sediakannya"</string>
-    <string name="remote_setup_welcome_message_choice_no" msgid="4512130141361047728">"Bukan sekarang"</string>
-    <string name="remote_setup_welcome_message_choice_learn_more" msgid="1450743243355011188">"Ketahui lebih lanjut"</string>
-    <string name="remote_setup_configuring_title" msgid="426693490088036953">"Mengkonfigurasikan"</string>
-    <string name="tv_brand_selection_title" msgid="115806286404235523">"Pilih jenama TV anda"</string>
-    <string name="verify_tv_works_title" msgid="3032439000825004562">"Cubalah"</string>
-    <string name="verify_tv_works_title_second" msgid="385858407975452465">"Sekarang bagaimana?"</string>
-    <string name="remote_setup_tv_works_choice_yes" msgid="4845224377319634589">"Berfungsi"</string>
-    <string name="remote_setup_tv_works_choice_no" msgid="4592512199517822882">"Tidak berfungsi"</string>
-    <string name="remote_setup_tv_works_choice_exit" msgid="3284401175722431348">"Selesaikan perkara ini kemudian"</string>
-    <string name="remote_setup_av_receiver_message_title" msgid="6684021872456430428">"Adakah anda menggunakan penerima AV untuk mengawal kelantangan atau menukar sumber video?"</string>
-    <string name="remote_setup_av_receiver_message_choice_yes" msgid="4425950273612887422">"Ya, ada"</string>
-    <string name="remote_setup_av_receiver_message_choice_no" msgid="4110689241054488465">"Tidak, TV sahaja"</string>
-    <string name="remote_setup_av_receiver_message_choice_unknown" msgid="7929184207846917118">"Saya tidak pasti"</string>
-    <string name="av_receiver_brand_selection_title" msgid="6590559258588648873">"Pilih jenama penerima AV anda"</string>
-    <string name="verify_av_receiver_works_title" msgid="269543338100774333">"Cubalah"</string>
-    <string name="verify_av_receiver_works_title_second" msgid="5746428972280536169">"Sekarang bagaimana?"</string>
-    <string name="remote_setup_av_receiver_works_choice_yes" msgid="3958668567541773813">"Berfungsi"</string>
-    <string name="remote_setup_av_receiver_works_choice_no" msgid="4298074971218301801">"Tidak berfungsi"</string>
-    <string name="remote_setup_complete_title" msgid="5621039651988402414">"Alat kawalan jauh anda sudah disediakan"</string>
-    <string name="remote_setup_complete_indicator" msgid="7561911666937200298">"✔"</string>
-    <string name="remote_setup_complete_hint" msgid="895288876842034764">"Anda boleh menukar atau mengemas kini perkara ini dalam Tetapan"</string>
-    <string name="remote_setup_failure_title" msgid="5556977469090883888">"Nampaknya anda sudah mencuba semua kod yang tersedia untuk Sony TV dan tidak menemui sebarang kod yang dapat digunakan"</string>
-    <string name="remote_setup_no_more_codes_title" msgid="8248001602463811004">"Tidak terdapat pilihan lagi untuk jenama yang telah anda pilih."</string>
-    <string name="remote_volume_control_title" msgid="42790796387499754">"Kawalan kelantangan"</string>
-    <string name="remote_volume_control_description" msgid="1709266463890271158">"Manakah peranti yang harus dikawal oleh kunci kelantangan kawalan jauh anda?"</string>
-    <string name="remote_volume_control_tv" msgid="8238742772961949484">"TV"</string>
-    <string name="remote_volume_control_avr" msgid="1210344689909782196">"Penerima AV"</string>
-    <string name="remote_volume_control_more_info" msgid="3974235951312948896">"Ketahui lebih lanjut"</string>
-    <string name="remote_input_control_title" msgid="2162123799829832793">"Kawalan input"</string>
-    <string name="remote_input_control_description" msgid="4463232750558670880">"Manakah peranti yang harus dikawal oleh kunci input kawalan jauh anda?"</string>
-    <string name="remote_input_control_tv" msgid="1161797798141087133">"TV"</string>
-    <string name="remote_input_control_avr" msgid="4332681403776201898">"Penerima AV"</string>
-    <string name="remote_input_control_more_info" msgid="2288173413092344097">"Ketahui lebih lanjut"</string>
-    <string name="remote_power_control_title" msgid="6900887500636256080">"Kawalan kuasa"</string>
-    <string name="remote_power_control_description" msgid="3169112762029996294">"Manakah peranti yang harus dikawal oleh kunci kuasa kawalan jauh anda?"</string>
-    <string name="remote_power_control_tv" msgid="20401013011107997">"TV"</string>
-    <string name="remote_power_control_avr" msgid="7915107400409384444">"Penerima AV"</string>
-    <string name="remote_power_control_more_info" msgid="6548476606481318540">"Ketahui lebih lanjut"</string>
-    <string name="remote_setup_tv_unable_to_configure_title" msgid="4278769121940609448">"Tidak boleh mengkonfigurasikan TV ini"</string>
-    <string name="remote_setup_tv_unable_to_configure_hint" msgid="1731804913207624724">"Anda boleh melakukan perkara ini kemudian dalam Tetapan."</string>
-    <string name="remote_setup_tv_unable_to_configure_continue" msgid="3805427230334915588">"Teruskan dengan persediaan"</string>
-    <string name="remote_setup_tv_unable_to_configure_try_again" msgid="6302613495483136852">"Cuba lagi"</string>
-    <string name="remote_setup_avr_unable_to_configure_title" msgid="7801918594788868621">"Tidak dapat mengkonfigurasikan penerima AV ini"</string>
-    <string name="remote_setup_avr_unable_to_configure_hint" msgid="1160999973083806587">"Anda boleh melakukan perkara ini kemudian dalam Tetapan."</string>
-    <string name="remote_setup_avr_unable_to_configure_continue" msgid="6233717853267060396">"Teruskan dengan persediaan"</string>
-    <string name="remote_setup_avr_unable_to_configure_try_again" msgid="4693947869846354939">"Cuba lagi"</string>
-    <string name="remote_programmed_successfully_ok" msgid="1375513531893934307">"OK"</string>
     <string name="device_apps_app_management_version" msgid="6315648665194084382">"versi <xliff:g id="APP_VERSION">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_force_stop" msgid="1803832648099079651">"Henti paksa"</string>
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Jika anda menghentikan aplikasi secara paksa, aplikasi itu mungkin tidak berfungsi dengan betul."</string>
diff --git a/Settings/res/values-ms-rMY-notouch/strings.xml b/Settings/res/values-ms-rMY-notouch/strings.xml
index 406085c..80c80b3 100644
--- a/Settings/res/values-ms-rMY-notouch/strings.xml
+++ b/Settings/res/values-ms-rMY-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Jika anda menghentikan aplikasi secara paksa, aplikasi itu mungkin tidak berfungsi dengan betul."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Nyahpasang"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Adakah anda mahu menyahpasang apl ini?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Lumpuhkan"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Adakah anda ingin melumpuhkan apl ini?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Dayakan"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Adakah anda ingin mendayakan apl ini?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Padam bersih data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Semua data apl ini akan dipadamkan secara kekal."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Ini termasuklah semua fail, tetapan, akaun, pangkalan data, dsb."</string>
diff --git a/Settings/res/values-ms-rMY/strings.xml b/Settings/res/values-ms-rMY/strings.xml
index 688704a..2f25b06 100644
--- a/Settings/res/values-ms-rMY/strings.xml
+++ b/Settings/res/values-ms-rMY/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sandarkan &amp; pulihkan"</string>
     <string name="device_reset" msgid="2827002349560023125">"Tetapan semula data kilang"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Penentukuran"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Apl yang dimuat turun"</string>
     <string name="apps_system" msgid="2499191125802829425">"Apl sistem"</string>
     <string name="apps_running" msgid="6430310491739956228">"Apl yang dijalankan"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Bahasa"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Papan kekunci"</string>
     <string name="system_search" msgid="2837264654143247611">"Cari"</string>
-    <string name="system_security" msgid="4190058778883258927">"Keselamatan &amp; Sekatan"</string>
+    <string name="system_security" msgid="8230080273993484407">"Keselamatan &amp; sekatan"</string>
     <string name="system_speech" msgid="8128688499687306982">"Pertuturan"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Input"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Kebolehaksesan"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Kemas kini sistem"</string>
     <string name="about_preference" msgid="4131396784531360434">"Perihal"</string>
     <string name="device_name" msgid="2670488158531273028">"Nama peranti"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Mulakan semula"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Maklumat undang-undang"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Jaminan"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Lesen sumber terbuka"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Lihat Syarat Perkhidmatan"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Lihat Dasar Privasi"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Lihat Syarat Tambahan"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Undang-undang Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Data lesen tidak tersedia"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Versi"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Tarikh"</string>
     <string name="system_time" msgid="6726022312605226285">"Masa"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Tetapkan tarikh"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Pilih format tarikh"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Tetapkan masa"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Tetapkan zon waktu"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Gunakan format 24 jam"</string>
diff --git a/Settings/res/values-my-rMM-notouch/strings.xml b/Settings/res/values-my-rMM-notouch/strings.xml
index be12f9d..09599e9 100644
--- a/Settings/res/values-my-rMM-notouch/strings.xml
+++ b/Settings/res/values-my-rMM-notouch/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_setup_input_password" msgid="4324884380214448502">"<xliff:g id="SSID">%1$s</xliff:g>အတွက် သင်၏ စကားဝှက်ကို ထည့်သွင်းရန်"</string>
+    <string name="wifi_setup_input_password" msgid="4324884380214448502">"<xliff:g id="SSID">%1$s</xliff:g>အတွက် သင်၏ စကားဝှက်ကို ထည့်သွင်းရန်"</string>
     <string name="wifi_setup_waiting_for_join" msgid="42826539810553389">"ချိတ်တွဲနေ ^1"</string>
     <string name="wifi_setup_connection_success" msgid="3362351168182711828">"အောင်မြင်စွာ ချိတ်ဆက်ပြီး!"</string>
     <string name="wifi_setup_save_success" msgid="2001513015933996675">"အောင်မြင်စွာ သိမ်းဆည်းပြီး!"</string>
@@ -26,11 +26,15 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"သင်က app တစ်ခုကို အတင်း ရပ်ခိုင်းခဲ့လျှင် ၎င်း၏ ပြုမူပုံ မှားယွင်းနိုင်သည်။"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"ဖြုတ်ရန်"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"ဒီအပလီကေးရှင်းကို ဖြုတ်ချင်ပါသလား?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"ပိတ်ထားရန်"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"ဤ app အားသင်ပိတ်လိုသလား?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"ဖွင့်ရန်"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"ဤ app အားသင်ဖွင့်လိုသလား?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ဒေတာကို ရှင်းလင်းရန်"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ဒီapp၏ ဒေတာ အားလုံးကို ထာဝရ ဖျက်ပစ်မည်။"</string>
-    <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ဒီထဲမှာ ဖိုင်များ၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်များ၊ စသဖြင့် အားလုံး အကျုံးဝင်သည်။"</string>
+    <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ဒီထဲမှာ ဖိုင်များ၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်များ၊ စသဖြင့် အားလုံး အကျုံးဝင်သည်။"</string>
     <string name="device_apps_app_management_clear_default" msgid="6654723680469212060">"ပုံသေများကို ရှင်းလင်းရန်"</string>
-    <string name="device_apps_app_management_clear_default_set" msgid="6233682647156684225">"ဒီappကို အချို့ လုပ်ဆောင်ချက်များ အတွက် စဖွင့်သတ်မှတ်ပေးရန်"</string>
+    <string name="device_apps_app_management_clear_default_set" msgid="6233682647156684225">"ဒီappကို အချို့ လုပ်ဆောင်ချက်များ အတွက် စဖွင့်သတ်မှတ်ပေးရန်"</string>
     <string name="device_apps_app_management_clear_default_none" msgid="6312021202504995474">"ပုံသေများ သတ်မှတ် မထား"</string>
     <string name="device_apps_app_management_clear_cache" msgid="7878530504449821203">"ကက်ရှကို ရှင်းလင်းရန်"</string>
     <string name="device_apps_app_management_notifications" msgid="7069935222112158478">"အကြောင်းကြားချက်များ"</string>
@@ -48,24 +52,24 @@
     <string name="device_daydreams_screen_off" msgid="1846621864054404830">"နားရန် အချိန်"</string>
     <string name="device_daydreams_screen_off_description" msgid="7699124270812914310">"မလှုပ်ရှားမှု ဒီကာလ နောက်မှာ မျက်နှာပြင် ပိတ်သွားမည်။"</string>
     <string name="device_daydreams_screen_off_summary" msgid="6350806465141059041">"<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> အိပ်မက် နောက်မှာ"</string>
-    <string name="backup_configure_account_default_summary" msgid="2013649183664358673">"မည်သည့်အကောင့်မှ ဘက်အာပ် ဒေတာကို လောလောဆယ်မှာ သိုလှောင်ခြင်း မပြုလုပ်ပါ။"</string>
+    <string name="backup_configure_account_default_summary" msgid="2013649183664358673">"မည်သည့်အကောင့်မှ ဘက်အာပ် ဒေတာကို လောလောဆယ်မှာ သိုလှောင်ခြင်း မပြုလုပ်ပါ။"</string>
     <string name="backup_erase_dialog_title" msgid="8900389956460363471"></string>
-    <string name="backup_erase_dialog_message" msgid="448169495686297910">"သင်၏ ကြိုးမဲ့ စကားဝှက်များ၊ စာညှပ်များ၊ အခြား ဆက်တင်များ၊ နှင့် app ဒေတာကို ဘက်အာပ် လုပ်မှု ရပ်စဲလိုက်ကာ Google ဆာဗာများ၏ ကော်ပီ အားလုံးကို ဖျက်ပစ်ရမလား?"</string>
+    <string name="backup_erase_dialog_message" msgid="448169495686297910">"သင်၏ ကြိုးမဲ့ စကားဝှက်များ၊ စာညှပ်များ၊ အခြား ဆက်တင်များ၊ နှင့် app ဒေတာကို ဘက်အာပ် လုပ်မှု ရပ်စဲလိုက်ကာ Google ဆာဗာများ၏ ကော်ပီ အားလုံးကို ဖျက်ပစ်ရမလား?"</string>
     <string name="privacy_backup_data" msgid="3652306596140877278">"ကျွန်ုပ်၏ ဒေတာကို ဘက်အာပ် လုပ်ရန်"</string>
-    <string name="privacy_backup_account" msgid="6127132568071889274">"ဘက်အာပ် အကောင့်"</string>
+    <string name="privacy_backup_account" msgid="6127132568071889274">"ဘက်အာပ် အကောင့်"</string>
     <string name="privacy_automatic_restore" msgid="8896792578363571896">"အလိုအလျောက် ပြန်လည်ဖေါ်ထုတ်ရန်"</string>
     <string name="factory_reset_device" msgid="7615350252195583106">"ကိရိယာ ပြန်ညှိရန်"</string>
-    <string name="factory_reset_description" msgid="6709336495536583649">"ဒီလုပ်ရပ်က သင့် ကိရိယာ ထဲက ဒေတာများ အားလုံးကို ဖျက်ပစ်မှာ ဖြစ်ပြီး၊ ပါဝင်ကြမည်မှာ: သင်၏ Google အကောင့်၊ စနစ် နှင့် app ဒေတာ နှင့် ဆက်တင်များ၊ ပြီးတော့ ဒေါင်းလုဒ် လုပ်ပြီး appများ။"</string>
-    <string name="confirm_factory_reset_description" msgid="5710644039419606428">"သင့် ကိုယ်ပိုင် အချက်အလက်များ နှင့် ဒေါင်းလုဒ် ပြုလုပ်ထားသည့် appများ အားလုံးကို ဖျက်မလား? ဒီ လုပ်ဆောင်ချက်ကို သင်သည် ပြန်ပြောင်း၍ မရနိုင်ပါ!"</string>
+    <string name="factory_reset_description" msgid="6709336495536583649">"ဒီလုပ်ရပ်က သင့် ကိရိယာ ထဲက ဒေတာများ အားလုံးကို ဖျက်ပစ်မှာ ဖြစ်ပြီး၊ ပါဝင်ကြမည်မှာ: သင်၏ Google အကောင့်၊ စနစ် နှင့် app ဒေတာ နှင့် ဆက်တင်များ၊ ပြီးတော့ ဒေါင်းလုဒ် လုပ်ပြီး appများ။"</string>
+    <string name="confirm_factory_reset_description" msgid="5710644039419606428">"သင့် ကိုယ်ပိုင် အချက်အလက်များ နှင့် ဒေါင်းလုဒ် ပြုလုပ်ထားသည့် appများ အားလုံးကို ဖျက်မလား? ဒီ လုပ်ဆောင်ချက်ကို သင်သည် ပြန်ပြောင်း၍ မရနိုင်ပါ!"</string>
     <string name="confirm_factory_reset_device" msgid="519046408823105666">"အရာတိုင်းကို ဖျက်ပစ်ရန်"</string>
     <string name="dismiss_all_notifications" msgid="3350731990365092847">"အားလုံးကို ပယ်ရန်"</string>
     <string name="no_notifications" msgid="3241328952121767751">"မရှိ"</string>
-    <string name="do_not_disturb_title" msgid="1050245577355301376">"မနှောက်ယှက်ပါနှင့်"</string>
-    <string name="do_not_disturb_desc" msgid="3186041965642361597">"ဖွင့်ထားလျှင်၊ အကြောင်းကြားချက်များသည် ဆက်တင်များ ထဲမှာသာ ပေါ်လာကြမည်"</string>
+    <string name="do_not_disturb_title" msgid="1050245577355301376">"မနှောက်ယှက်ပါနှင့်"</string>
+    <string name="do_not_disturb_desc" msgid="3186041965642361597">"ဖွင့်ထားလျှင်၊ အကြောင်းကြားချက်များသည် ဆက်တင်များ ထဲမှာသာ ပေါ်လာကြမည်"</string>
     <string name="select_title" msgid="2657901623249723536">"သင်၏ ^1 အတွက် အမည်ကို ရွေးပါ"</string>
     <string name="select_description" msgid="4080602542483519716">"အမည် ရှိခြင်းက သင်၏ ^1 ကို သင်၏ ဖုန်း၊ တက်ဘလက်၊ သို့မဟုတ် ကွန်ပျူတာလို အခြား ကိရိယာများမှ သုံးမှုကို ပြသပေးမည်။."</string>
   <string-array name="rooms">
-    <item msgid="2748008285322003570">"ဧည့်ခန်း"</item>
+    <item msgid="2748008285322003570">"ဧည့်ခန်း"</item>
     <item msgid="7887185726776968055">"မီဒီယာ အခန်း"</item>
     <item msgid="372573326176756144">"မိသားစု အခန်း"</item>
     <item msgid="8112576067079559786">"ထမင်းစားခန်း"</item>
@@ -73,11 +77,11 @@
     <item msgid="7390608863950443962">"အိပ်ခန်း"</item>
     <item msgid="682313511953895794">"မီးဖိုချောင်"</item>
   </string-array>
-    <string name="custom_room" msgid="5972936200641815527">"စိတ်ကြိုက် အမည်ကို ရိုက်ထည့်ရန်…"</string>
+    <string name="custom_room" msgid="5972936200641815527">"စိတ်ကြိုက် အမည်ကို ရိုက်ထည့်ရန်…"</string>
     <string name="settings_status_title" msgid="3280459921834269206">"ဒီ ^1 ကို အမည်ပေးထားပြီ"</string>
     <string name="settings_status_description" msgid="4892610880616296037">"\"^1\" မှာ ဒီ^2 ၏ အမည် ဖြစ်သည်။ သင် အဲဒါကို ပြောင်းလဲချင်ပါသလား?"</string>
     <string name="change_setting" msgid="199354038426145612">"ပြောင်းရန်"</string>
-    <string name="keep_settings" msgid="549230720820096102">"မပြောင်းလဲပါနှင့်"</string>
+    <string name="keep_settings" msgid="549230720820096102">"မပြောင်းလဲပါနှင့်"</string>
     <string name="menu_help" msgid="2164687828212723531">"အကူအညီ"</string>
     <string name="setup_failure_title" msgid="4408868360762577232">"အမှား တစ်ခု ကြုံခဲ့ရ"</string>
     <string name="setup_failure_button_retry" msgid="4917381906591779977">"ထပ်စမ်းရန်"</string>
diff --git a/Settings/res/values-my-rMM/arrays.xml b/Settings/res/values-my-rMM/arrays.xml
index a3dbc3c..63754fc 100644
--- a/Settings/res/values-my-rMM/arrays.xml
+++ b/Settings/res/values-my-rMM/arrays.xml
@@ -28,13 +28,13 @@
     <item msgid="2366780999250675263">"အဆက် ဖြတ်လိုက်ပြီ"</item>
     <item msgid="944848437579938960">"မအောင်မြင်ပါ"</item>
     <item msgid="6501589509838730555">"ပိတ်ဆို့ထား"</item>
-    <item msgid="1877062378387320625">"ညံ့သည့် ချိတ်ဆက်မှုကို ယာယီ ရှောင်ရှားနေ"</item>
+    <item msgid="1877062378387320625">"ညံ့သည့် ချိတ်ဆက်မှုကို ယာယီ ရှောင်ရှားနေ"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="8339598300796362026"></item>
     <item msgid="4703591207522320165">"စကင်လုပ်နေ…"</item>
     <item msgid="7351421574703844779">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> နှင့် ဆက်သွယ်နေ…"</item>
-    <item msgid="874502389678205660">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> နှင့် အထောက်အထားကို စိစစ်နေ…"</item>
+    <item msgid="874502389678205660">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> နှင့် အထောက်အထားကို စိစစ်နေ…"</item>
     <item msgid="7964187733783647040">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> မှ IP လိပ်စာ ရယူနေ…"</item>
     <item msgid="4990222034464002805">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> နှင့် ဆက်သွယ်ထားပြီ"</item>
     <item msgid="5347651564202902346">"ရွှေ့ဆိုင်းထား"</item>
@@ -42,7 +42,7 @@
     <item msgid="4985746712759777559">"ချိတ်ဆက်မှု ပြတ်သွား"</item>
     <item msgid="6482743140170037710">"မအောင်မြင်ပါ"</item>
     <item msgid="7486075980265993798">"ပိတ်ဆို့ထား"</item>
-    <item msgid="6842213039083339420">"ညံ့သည့် ချိတ်ဆက်မှုကို ယာယီ ရှောင်ရှားနေ"</item>
+    <item msgid="6842213039083339420">"ညံ့သည့် ချိတ်ဆက်မှုကို ယာယီ ရှောင်ရှားနေ"</item>
   </string-array>
   <string-array name="sleep_timeout_entries">
     <item msgid="1213527366819650274">"၅ မိနစ်"</item>
@@ -57,7 +57,7 @@
     <item msgid="5216959047515554188">"၃ နာရီ"</item>
     <item msgid="4152882798140628647">"၆ နာရီ"</item>
     <item msgid="412984226950404956">"၁၂ နာရီ"</item>
-    <item msgid="2178434662173258997">"မည်သည့်အခါမှ"</item>
+    <item msgid="2178434662173258997">"မည်သည့်အခါမှ"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="6733816499120044964">"မရှိ"</item>
diff --git a/Settings/res/values-my-rMM/strings.xml b/Settings/res/values-my-rMM/strings.xml
index d9e7d10..d1d2944 100644
--- a/Settings/res/values-my-rMM/strings.xml
+++ b/Settings/res/values-my-rMM/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ဘက်အာပ် လုပ်ခြင်း &amp; ပြန်လည်ဖေါ်ထုတ်ခြင်း"</string>
     <string name="device_reset" msgid="2827002349560023125">"စက်ရုံအတိုင်း ပြန်ညှိရန်"</string>
     <string name="device_calibration" msgid="8632962533376605191">"စံကိုက်ညှိမှု"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"ဒေါင်းလုဒ် လုပ်ထားသည့် Appများ"</string>
     <string name="apps_system" msgid="2499191125802829425">"စနစ် Appများ"</string>
     <string name="apps_running" msgid="6430310491739956228">"ဖွင့်သုံးနေသည့် Appများ"</string>
@@ -74,7 +78,7 @@
     <string name="accessory_unpair" msgid="8242725516604465355">"တွဲချိတ်မှုဖြုတ်ရန်"</string>
     <string name="accessory_unpairing" msgid="7568241162181184667">"ကိရိယာကို တွဲထားမှုမှ ဖြုတ်နေ…"</string>
     <string name="accessory_connected" msgid="2156489304110030393">"ချိတ်ဆက်ထား"</string>
-    <string name="accessories_add_title" msgid="6940361421891873321">"အသုံးအဆောင် ပစ္စည်းများကို ရှာကြည့်နေ…"</string>
+    <string name="accessories_add_title" msgid="6940361421891873321">"အသုံးအဆောင်များကို ရှာဖွေနေ…"</string>
     <string name="accessories_add_bluetooth_inst" msgid="5892952745770640383">"သင်၏ ဘလူးတုသ် ကိရိယာများကို မချိတ်တွဲမီ၊ ၎င်းတို့ ချိတ်တွဲရေး မုဒ် ထဲမှာ ရှိနေတာကို စစ်ကြည့်ပါ"</string>
     <string name="accessories_autopair_msg" msgid="8618829246837821752">"ကိရိယာ တစ်ခုကို တွေ့ရှိခဲ့ရာ <xliff:g id="COUNTDOWN">%1$s</xliff:g> စက္ကန့် အတွင်းမှာ အလိုအလျောက် ချိတ်တွဲလိမ့်မည်"</string>
     <string name="accessories_add_title_multiple" msgid="8455249961819802466">"ကိရိယာ အများအပြားကို ရှာတွေ့ခဲ့"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ဘာသာစကား"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"ကီးဘုတ်"</string>
     <string name="system_search" msgid="2837264654143247611">"ရှာဖွေရန်"</string>
-    <string name="system_security" msgid="4190058778883258927">"လုံခြုံရေး &amp; ကန့်သတ်ချက်များ"</string>
+    <string name="system_security" msgid="8230080273993484407">"လုံခြုံရေး &amp; ကန့်သတ်ချက်များ"</string>
     <string name="system_speech" msgid="8128688499687306982">"နှုတ်စကား"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ထည့်သွင်းမှုများ"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ရယူသုံးနိုင်မှု"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"စနစ် မွမ်းမံမှု"</string>
     <string name="about_preference" msgid="4131396784531360434">"အကြောင်း"</string>
     <string name="device_name" msgid="2670488158531273028">"ကိရိယာ အမည်"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"အစက ပြန်စရန်"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"ဥပဒေဆိုင်ရာ အချက်အလက်များ"</string>
     <string name="about_warranty" msgid="5736003473060436384">"အာမခံ"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"အခမဲ့ ရင်းမြစ် လိုင်စင်များ"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"ဝန်ဆောင်မှု စည်းကမ်းချက်များ ကြည့်ရန်"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"ကိုယ်ရေး မူဝါဒကို ကြည့်ရန်"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"စည်းကမ်းချက် အပိုကို ကြည့်ရန်"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google၏ ဥပဒေရေးရာ"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"လိုင်စင် ဒေတာကို ရှာမရ"</string>
     <string name="about_model" msgid="6625269442206323995">"မော်ဒယ်"</string>
     <string name="about_version" msgid="1177287676732287266">"ဗားရှင်း"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"ရက်စွဲ"</string>
     <string name="system_time" msgid="6726022312605226285">"အချိန်"</string>
     <string name="system_set_date" msgid="2437586307768561116">"ရက်စွဲ  သတ်မှတ်ရန်"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"ရက်စွဲ ပုံစံ ရွေးရန်"</string>
     <string name="system_set_time" msgid="4661804115501057452">"အချိန် သတ်မှတ်ရန်"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"အချိန် ဇုန်ကို သတ်မှတ်ရန်"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"၂၄ နာရီပုံစံကို သုံးမည်"</string>
diff --git a/Settings/res/values-nb-notouch/strings.xml b/Settings/res/values-nb-notouch/strings.xml
index d1bbd55..026f5cb 100644
--- a/Settings/res/values-nb-notouch/strings.xml
+++ b/Settings/res/values-nb-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Hvis du tvinger en app til å stoppe, kan den oppføre seg uventet."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Avinstaller"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Vil du avinstallere denne appen?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Deaktiver"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Ønsker du å deaktivere denne appen?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Aktivér"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Ønsker du å aktivere denne appen?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Fjern data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Alle disse appdataene slettes permanent."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Dette inkluderer alle filer, innstillinger, kontoer, databaser osv."</string>
diff --git a/Settings/res/values-nb/strings.xml b/Settings/res/values-nb/strings.xml
index b5af48a..0a41e5b 100644
--- a/Settings/res/values-nb/strings.xml
+++ b/Settings/res/values-nb/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sikkerhetskopiering og gjenoppretting"</string>
     <string name="device_reset" msgid="2827002349560023125">"Tilbakestilling til fabrikkstandard"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrering"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Nedlastede apper"</string>
     <string name="apps_system" msgid="2499191125802829425">"System-apper"</string>
     <string name="apps_running" msgid="6430310491739956228">"Kjørende apper"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Språk"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tastatur"</string>
     <string name="system_search" msgid="2837264654143247611">"Søk"</string>
-    <string name="system_security" msgid="4190058778883258927">"Sikkerhet og begrensninger"</string>
+    <string name="system_security" msgid="8230080273993484407">"Sikkerhet og begrensninger"</string>
     <string name="system_speech" msgid="8128688499687306982">"Tale"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Innganger"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Tilgjengelighet"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Systemoppdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Info"</string>
     <string name="device_name" msgid="2670488158531273028">"Enhetsnavn"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Start på nytt"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Juridisk informasjon"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garanti"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Lisenser for åpen kildekode"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Se vilkårene for bruk"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Se personvernreglene"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Se tilleggsvilkårene"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Informasjon fra Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Lisensdata er utilgjengelige"</string>
     <string name="about_model" msgid="6625269442206323995">"Modell"</string>
     <string name="about_version" msgid="1177287676732287266">"Versjon"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Dato"</string>
     <string name="system_time" msgid="6726022312605226285">"Tid"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Angi dato"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Velg datoformat"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Angi klokkeslett"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Angi tidssone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Bruk 24-timers format"</string>
diff --git a/Settings/res/values-ne-rNP-notouch/strings.xml b/Settings/res/values-ne-rNP-notouch/strings.xml
index c94f913..a4fa06a 100644
--- a/Settings/res/values-ne-rNP-notouch/strings.xml
+++ b/Settings/res/values-ne-rNP-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"यदि तपाईँले अनुप्रयोगलाई जबर्जस्ती रोक्नु भएको खण्डमा त्यसले चाहेअनुसार काम नगर्न सक्छ।"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"विस्थापन गर्नुहोस्"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"के तपाईँ यो अनुप्रयोग अस्थापना गर्न चाहनु हुन्छ?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"अक्षम गर्नुहोस्"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"तपाईं यो अनुप्रयोग अक्षम गर्न चाहनुहुन्छ?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"सक्षम गर्नुहोस्"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"तपाईं यो अनुप्रयोग सक्षम गर्न चाहनुहुन्छ?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"डेटा हटाउनुहोस्"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"यो अनुप्रयोगको सबै डेटा स्थायी रूपमा मेटिने छ।"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"यसले सबै फाइलहरू, सेटिङहरू, खाताहरू, डेटाबेसहरू, आदी समावेश गर्दछ।"</string>
diff --git a/Settings/res/values-ne-rNP/strings.xml b/Settings/res/values-ne-rNP/strings.xml
index 441b4be..aab9f91 100644
--- a/Settings/res/values-ne-rNP/strings.xml
+++ b/Settings/res/values-ne-rNP/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"ब्याकअप र पुनःस्थापना"</string>
     <string name="device_reset" msgid="2827002349560023125">"कारखाना डेटा रिसेट"</string>
     <string name="device_calibration" msgid="8632962533376605191">"क्यालिब्रेसन"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"डाउनलोड भएका अनुप्रयोगहरू"</string>
     <string name="apps_system" msgid="2499191125802829425">"प्रणाली अनुप्रयोगहरू"</string>
     <string name="apps_running" msgid="6430310491739956228">"चालु अनुप्रयोगहरू"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"भाषा"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"किबोर्ड"</string>
     <string name="system_search" msgid="2837264654143247611">"खोजी गर्नुहोस्"</string>
-    <string name="system_security" msgid="4190058778883258927">"सुरक्षा र प्रतिबन्धहरू"</string>
+    <string name="system_security" msgid="8230080273993484407">"सुरक्षा &amp; प्रतिबन्धहरु"</string>
     <string name="system_speech" msgid="8128688499687306982">"वाणी"</string>
     <string name="system_inputs" msgid="2413907183796651102">"इनपुट"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"पहुँच"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"प्रणाली अद्यावधिक"</string>
     <string name="about_preference" msgid="4131396784531360434">"बारेमा"</string>
     <string name="device_name" msgid="2670488158531273028">"उपकरण नाम"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"पुन: सुरू गर्नुहोस्"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"कानूनी जानकारी"</string>
     <string name="about_warranty" msgid="5736003473060436384">"वारेन्टी"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"खुला स्रोत इजाजतपत्रहरू"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"सेवाका सर्तहरू अवलोकन गर्नुहोस्"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"गोपनीयता नीति अवलोकन गर्नुहोस्"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"अतिरिक्त सर्तहरू अवलोकन गर्नुहोस्"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google कानुनी"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"लाइसेन्स डेटा उपलब्ध छैन"</string>
     <string name="about_model" msgid="6625269442206323995">"मोडेल"</string>
     <string name="about_version" msgid="1177287676732287266">"संस्करण"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"मिति"</string>
     <string name="system_time" msgid="6726022312605226285">"समय"</string>
     <string name="system_set_date" msgid="2437586307768561116">"मिति सेट गर्नुहोस्"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"मिति ढाँचा छान्नुहोस्"</string>
     <string name="system_set_time" msgid="4661804115501057452">"समय सेट गर्नुहोस्"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"समयक्षेत्र मिलाउनुहोस्"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"२४-घण्टे ढाँचा प्रयोग गर्नुहोस्"</string>
diff --git a/Settings/res/values-nl-notouch/strings.xml b/Settings/res/values-nl-notouch/strings.xml
index 0714fcf..1ae32be 100644
--- a/Settings/res/values-nl-notouch/strings.xml
+++ b/Settings/res/values-nl-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Als u een app gedwongen stopt, kan deze onverwacht gedrag vertonen."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Verwijderen"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Wilt u deze app verwijderen?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Uitschakelen"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Wilt u deze app uitschakelen?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Inschakelen"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Wilt u deze app inschakelen?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Gegevens wissen"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Alle gegevens van deze app worden permanent verwijderd."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Dit geldt voor alle bestanden, instellingen, accounts, databases, enzovoort."</string>
diff --git a/Settings/res/values-nl/strings.xml b/Settings/res/values-nl/strings.xml
index d1a79b6..a8ce73f 100644
--- a/Settings/res/values-nl/strings.xml
+++ b/Settings/res/values-nl/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Back-up en herstel"</string>
     <string name="device_reset" msgid="2827002349560023125">"Fabrieks&amp;shy;instellingen terugzetten"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibratie"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Gedownloade apps"</string>
     <string name="apps_system" msgid="2499191125802829425">"Systeemapps"</string>
     <string name="apps_running" msgid="6430310491739956228">"Actieve apps"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Taal"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Toetsenbord"</string>
     <string name="system_search" msgid="2837264654143247611">"Zoeken"</string>
-    <string name="system_security" msgid="4190058778883258927">"Beveiliging en beperkingen"</string>
+    <string name="system_security" msgid="8230080273993484407">"Beveiliging en beperkingen"</string>
     <string name="system_speech" msgid="8128688499687306982">"Spraak"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Ingangen"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Toegankelijkheid"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Systeemupdate"</string>
     <string name="about_preference" msgid="4131396784531360434">"Over"</string>
     <string name="device_name" msgid="2670488158531273028">"Apparaatnaam"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Opnieuw opstarten"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Juridische informatie"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantie"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Open-sourcelicenties"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Servicevoorwaarden bekijken"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Privacybeleid bekijken"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Aanvullende voorwaarden bekijken"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Juridische informatie van Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licentiegegevens zijn niet beschikbaar"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Versie"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Tijd"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Datum instellen"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Datumnotatie selecteren"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Tijd instellen"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Tijdzone instellen"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-uurs klok gebruiken"</string>
diff --git a/Settings/res/values-notouch/strings.xml b/Settings/res/values-notouch/strings.xml
index cfedc2f..8be2b82 100644
--- a/Settings/res/values-notouch/strings.xml
+++ b/Settings/res/values-notouch/strings.xml
@@ -36,6 +36,14 @@
     <string name="device_apps_app_management_uninstall">Uninstall</string>
     <!-- Application management description for uninstalling the application [CHAR LIMIT=NONE] -->
     <string name="device_apps_app_management_uninstall_desc">Do you want to uninstall this app?</string>
+    <!-- Application management choice for disabling the application [CHAR LIMIT=40] -->
+    <string name="device_apps_app_management_disable">Disable</string>
+    <!-- Application management description for disabling the application [CHAR LIMIT=NONE] -->
+    <string name="device_apps_app_management_disable_desc">Do you want to disable this app?</string>
+    <!-- Application management choice for enabling the application [CHAR LIMIT=40] -->
+    <string name="device_apps_app_management_enable">Enable</string>
+    <!-- Application management description for enabling the application [CHAR LIMIT=NONE] -->
+    <string name="device_apps_app_management_enable_desc">Do you want to enable this app?</string>
     <!-- Application management choice for clearing the application's data [CHAR LIMIT=40] -->
     <string name="device_apps_app_management_clear_data">Clear data</string>
     <!-- Application management description for clearing the application's data [CHAR LIMIT=NONE] -->
diff --git a/Settings/res/values-pl-notouch/strings.xml b/Settings/res/values-pl-notouch/strings.xml
index a7c9f7a..6ed74cc 100644
--- a/Settings/res/values-pl-notouch/strings.xml
+++ b/Settings/res/values-pl-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Jeśli wymusisz zatrzymanie aplikacji, może ona zadziałać nieprawidłowo."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Odinstalowywanie"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Odinstalować tę aplikację?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Wyłącz"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Chcesz wyłączyć tę aplikację?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Włącz"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Chcesz włączyć tę aplikację?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Wyczyść dane"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Wszystkie dane tej aplikacji zostaną trwale usunięte."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Obejmuje to wszystkie pliki, ustawienia, konta, bazy danych itp."</string>
diff --git a/Settings/res/values-pl/strings.xml b/Settings/res/values-pl/strings.xml
index 0d943fe..af72e68 100644
--- a/Settings/res/values-pl/strings.xml
+++ b/Settings/res/values-pl/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="device_reset" msgid="2827002349560023125">"Przywracanie danych fabrycznych"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibracja"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Pobrane aplikacje"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplikacje systemowe"</string>
     <string name="apps_running" msgid="6430310491739956228">"Uruchomione aplikacje"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Język"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Klawiatura"</string>
     <string name="system_search" msgid="2837264654143247611">"Wyszukiwanie"</string>
-    <string name="system_security" msgid="4190058778883258927">"Bezpieczeństwo i ograniczenia"</string>
+    <string name="system_security" msgid="8230080273993484407">"Bezpieczeństwo i ograniczenia"</string>
     <string name="system_speech" msgid="8128688499687306982">"Mowa"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Wejścia"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Ułatwienia dostępu"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Aktualizacje systemu"</string>
     <string name="about_preference" msgid="4131396784531360434">"Informacje"</string>
     <string name="device_name" msgid="2670488158531273028">"Nazwa urządzenia"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Uruchom ponownie"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informacje prawne"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Gwarancja"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licencje open source"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Wyświetl Warunki usługi"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Wyświetl Politykę prywatności"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Wyświetl Dodatkowe warunki"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Informacje prawne Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Dane licencji są niedostępne"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Wersja"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Godzina"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Ustaw datę"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Wybierz format daty"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Ustaw godzinę"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Ustaw strefę czasową"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Format 24-godzinny"</string>
diff --git a/Settings/res/values-pt-notouch/strings.xml b/Settings/res/values-pt-notouch/strings.xml
index 7053707..4a221ab 100644
--- a/Settings/res/values-pt-notouch/strings.xml
+++ b/Settings/res/values-pt-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Se você forçar a interrupção de um app, ele pode apresentar mau funcionamento."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalar"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Deseja desinstalar este app?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Desativar"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Deseja desativar este app?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Ativar"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Deseja ativar este app?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Limpar dados"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Todos esses dados do app serão excluídos permanentemente."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Isso inclui todos os arquivos, configurações, contas, bancos de dados, etc."</string>
diff --git a/Settings/res/values-pt-rPT-notouch/strings.xml b/Settings/res/values-pt-rPT-notouch/strings.xml
index c54474d..2148a10 100644
--- a/Settings/res/values-pt-rPT-notouch/strings.xml
+++ b/Settings/res/values-pt-rPT-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Se forçar a paragem de uma aplicação, esta poderá apresentar um comportamento anormal."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Desinstalar"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Pretende desinstalar esta aplicação?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Desativar"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Pretende desativar esta aplicação?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Ativar"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Pretende ativar esta aplicação?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Limpar dados"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Todos os dados desta aplicação serão eliminados permanentemente."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Isto inclui todos os ficheiros, definições, contas, bases de dados, etc."</string>
diff --git a/Settings/res/values-pt-rPT/strings.xml b/Settings/res/values-pt-rPT/strings.xml
index f049874..0cec0cf 100644
--- a/Settings/res/values-pt-rPT/strings.xml
+++ b/Settings/res/values-pt-rPT/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Cópia de segurança e restauro"</string>
     <string name="device_reset" msgid="2827002349560023125">"Reposição de dados de fábrica"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibração"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplicações transferidas"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplicações do sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplicações em execução"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Idioma"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teclado"</string>
     <string name="system_search" msgid="2837264654143247611">"Pesquisa"</string>
-    <string name="system_security" msgid="4190058778883258927">"Segurança e restrições"</string>
+    <string name="system_security" msgid="8230080273993484407">"Segurança e restrições"</string>
     <string name="system_speech" msgid="8128688499687306982">"Voz"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entradas"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Acessibilidade"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Atualização do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Acerca de"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reiniciar"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informações legais"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantia"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licenças de código aberto"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Ver os Termos de Utilização"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Ver a Política de Privacidade"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ver os Termos Adicionais"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google jurídico"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Dados da licença indisponíveis"</string>
     <string name="about_model" msgid="6625269442206323995">"Modelo"</string>
     <string name="about_version" msgid="1177287676732287266">"Versão"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Hora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Definir data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Selecionar formato de data"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Definir hora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Definir fuso horário"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Utilizar formato de 24 horas"</string>
diff --git a/Settings/res/values-pt/strings.xml b/Settings/res/values-pt/strings.xml
index 5eac0a3..48a35de 100644
--- a/Settings/res/values-pt/strings.xml
+++ b/Settings/res/values-pt/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Backup e restauração"</string>
     <string name="device_reset" msgid="2827002349560023125">"Redefinir configuração original"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibração"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Apps transferidos"</string>
     <string name="apps_system" msgid="2499191125802829425">"Apps do sistema"</string>
     <string name="apps_running" msgid="6430310491739956228">"Apps em execução"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Idioma"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Teclado"</string>
     <string name="system_search" msgid="2837264654143247611">"Pesquisar"</string>
-    <string name="system_security" msgid="4190058778883258927">"Segurança e restrições"</string>
+    <string name="system_security" msgid="8230080273993484407">"Segurança e restrições"</string>
     <string name="system_speech" msgid="8128688499687306982">"Comando de voz"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Entradas"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Acessibilidade"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Atualização do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Sobre"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reiniciar"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informações legais"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garantia"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licenças de código aberto"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Ver Termos de serviço"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Ver Política de privacidade"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ver Termos adicionais"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Informações legais do Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Os dados de licença estão indisponíveis"</string>
     <string name="about_model" msgid="6625269442206323995">"Modelo"</string>
     <string name="about_version" msgid="1177287676732287266">"Versão"</string>
@@ -142,7 +145,7 @@
     <string name="title_signal_strength" msgid="205478650262078041">"Potência do sinal"</string>
     <string name="title_ip_address" msgid="4533523100923004711">"Endereço IP"</string>
     <string name="title_ssid" msgid="4858945903642469730">"Insira o nome da rede Wi-Fi"</string>
-    <string name="title_internet_connection" msgid="8710084774588697646">"conexão_de_internet"</string>
+    <string name="title_internet_connection" msgid="8710084774588697646">"Conexão de Internet"</string>
     <string name="connected" msgid="7563100162902079938">"Conectada"</string>
     <string name="not_connected" msgid="6858480380326923017">"Não conectado"</string>
     <string name="wifi_setting_header_available_networks" msgid="6244107218643835636">"Wi-Fi"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Horário"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Definir data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Escolher formato de data"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Definir hora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Definir fuso horário"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Usar formato de 24 horas"</string>
diff --git a/Settings/res/values-ro-notouch/strings.xml b/Settings/res/values-ro-notouch/strings.xml
index fb0bb84..348c078 100644
--- a/Settings/res/values-ro-notouch/strings.xml
+++ b/Settings/res/values-ro-notouch/strings.xml
@@ -22,10 +22,14 @@
     <string name="wifi_setup_save_success" msgid="2001513015933996675">"Configurație salvată!"</string>
     <string name="device_apps_app_management_version" msgid="6315648665194084382">"versiunea <xliff:g id="APP_VERSION">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_open" msgid="3326361233913951387">"Deschideți"</string>
-    <string name="device_apps_app_management_force_stop" msgid="1803832648099079651">"Oprire forțată"</string>
+    <string name="device_apps_app_management_force_stop" msgid="1803832648099079651">"Opriți forțat"</string>
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Dacă forțați oprirea unei aplicații, aceasta se poate comporta necorespunzător."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Dezinstalați"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Doriți să dezinstalați această aplicație?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Dezactivați"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Doriți să dezactivați această aplicație?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Activați"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Doriți să activați această aplicație?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Ștergeți datele"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Toate datele acestei aplicații vor fi șterse definitiv."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Ștergerea afectează toate fișierele, setările, conturile, bazele de date etc."</string>
@@ -41,7 +45,7 @@
     <string name="settings_off" msgid="4439170658516725721">"Dezactivat"</string>
     <string name="device_daydreams_none" msgid="5310233518671772034">"Niciunul"</string>
     <string name="device_daydreams_select" msgid="1754678562660674925">"Daydream"</string>
-    <string name="device_daydreams_test" msgid="7442554912076991502">"Începeți acum"</string>
+    <string name="device_daydreams_test" msgid="7442554912076991502">"Începe acum"</string>
     <string name="device_daydreams_sleep" msgid="5263432145910468025">"Când pornește Daydream"</string>
     <string name="device_daydreams_sleep_description" msgid="8438730889852772376">"Daydream va porni după perioada de inactivitate. Dacă nu selectați un screensaver, ecranul se va stinge."</string>
     <string name="device_daydreams_sleep_summary" msgid="4442691086777437088">"După <xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
diff --git a/Settings/res/values-ro/strings.xml b/Settings/res/values-ro/strings.xml
index 24d45dc..6b84336 100644
--- a/Settings/res/values-ro/strings.xml
+++ b/Settings/res/values-ro/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Creați și restabiliți backupuri"</string>
     <string name="device_reset" msgid="2827002349560023125">"Resetarea configurării din fabrică"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Calibrare"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Aplicații descărcate"</string>
     <string name="apps_system" msgid="2499191125802829425">"Aplicații de sistem"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplicații pornite"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Limbă"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tastatură"</string>
     <string name="system_search" msgid="2837264654143247611">"Căutare"</string>
-    <string name="system_security" msgid="4190058778883258927">"Securitate și restricții"</string>
+    <string name="system_security" msgid="8230080273993484407">"Securitate și restricții"</string>
     <string name="system_speech" msgid="8128688499687306982">"Recunoaștere vocală"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Intrări"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilitate"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Actualizare de sistem"</string>
     <string name="about_preference" msgid="4131396784531360434">"Despre"</string>
     <string name="device_name" msgid="2670488158531273028">"Nume dispozitiv"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reporniți"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Informații de ordin juridic"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garanție"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licențe open source"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Vedeți Termenii și condițiile"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Vedeți Politica de confidențialitate"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Vedeți Termenii suplimentari"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Aspecte juridice Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Datele despre licență nu sunt disponibile"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Versiune"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Data"</string>
     <string name="system_time" msgid="6726022312605226285">"Ora"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Setați data"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Alegeți formatul datei"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Setați ora"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Setați fusul orar"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Utilizați formatul de 24 de ore"</string>
@@ -278,8 +280,8 @@
     <string name="location_mode_title" msgid="6573195849329396150">"Mod"</string>
     <string name="location_category_recent_location_requests" msgid="3437903422445812245">"Solicitări de locație recente"</string>
     <string name="location_no_recent_apps" msgid="4218851908476344030">"Nicio aplicație nu a solicitat locația recent"</string>
-    <string name="location_high_battery_use" msgid="576143332793626088">"Utilizarea intensă a bateriei"</string>
-    <string name="location_low_battery_use" msgid="5756040390248358148">"Utilizarea redusă a bateriei"</string>
+    <string name="location_high_battery_use" msgid="576143332793626088">"Utilizare intensă a bateriei"</string>
+    <string name="location_low_battery_use" msgid="5756040390248358148">"Utilizare redusă a bateriei"</string>
     <string name="location_mode_wifi_description" msgid="2778774510654527264">"Utilizați Wi-Fi pentru a estima locația"</string>
     <string name="location_status" msgid="3456414279428237558">"Starea locației"</string>
     <string name="location_services" msgid="5441085185119797200">"Servicii de localizare"</string>
diff --git a/Settings/res/values-ru-notouch/strings.xml b/Settings/res/values-ru-notouch/strings.xml
index 7c7044d..867e368 100644
--- a/Settings/res/values-ru-notouch/strings.xml
+++ b/Settings/res/values-ru-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Принудительное закрытие приложения может привести к ошибкам."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Удалить"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Удалить приложение?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Отключить"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Отключить это приложение?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Включить"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Включить это приложение?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Удалить данные"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Все данные в этом приложении будут удалены без возможности восстановления."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Это касается файлов, настроек, аккаунтов, баз данных и т. д."</string>
diff --git a/Settings/res/values-ru/strings.xml b/Settings/res/values-ru/strings.xml
index c9be97e..331211d 100644
--- a/Settings/res/values-ru/strings.xml
+++ b/Settings/res/values-ru/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Резервное копирование и восстановление"</string>
     <string name="device_reset" msgid="2827002349560023125">"Заводские настройки"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калибровка"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Скачанные приложения"</string>
     <string name="apps_system" msgid="2499191125802829425">"Системные приложения"</string>
     <string name="apps_running" msgid="6430310491739956228">"Выполняющиеся приложения"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Язык"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Клавиатура"</string>
     <string name="system_search" msgid="2837264654143247611">"Поиск"</string>
-    <string name="system_security" msgid="4190058778883258927">"Безопасность и ограничения"</string>
+    <string name="system_security" msgid="8230080273993484407">"Безопасность и ограничения"</string>
     <string name="system_speech" msgid="8128688499687306982">"Речь"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Входы"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Специальные возможности"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Обновление системы"</string>
     <string name="about_preference" msgid="4131396784531360434">"Об устройстве"</string>
     <string name="device_name" msgid="2670488158531273028">"Название устройства"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Перезапустить"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Юридическая информация"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Гарантия"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Лицензии открытого ПО"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Условия использования"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Политика конфиденциальности"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Дополнительные условия"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Правовая информация Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Нет данных о лицензии"</string>
     <string name="about_model" msgid="6625269442206323995">"Модель"</string>
     <string name="about_version" msgid="1177287676732287266">"Версия"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Дата"</string>
     <string name="system_time" msgid="6726022312605226285">"Время"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Установить дату"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Формат даты"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Установить время"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Выбрать часовой пояс"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-часовой формат"</string>
@@ -295,7 +297,7 @@
     <string name="delete_location_history_desc" msgid="4142806827237093397">"История местоположений этого аккаунта Google будет удалена с устройства навсегда. Некоторые приложения, включая Google Now, перестанут работать."</string>
     <string name="system_services" msgid="7230571820151215779">"Сервисы"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Настройки службы"</string>
-    <string name="accessibility_captions" msgid="6133896463407851079">"Титры"</string>
+    <string name="accessibility_captions" msgid="6133896463407851079">"Субтитры"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Настройки субтитров в видео"</string>
     <string name="captions_display" msgid="735692527287125548">"Экран"</string>
     <string name="captions_display_on" msgid="1989009878719500520">"Вкл."</string>
@@ -362,7 +364,7 @@
     <string name="system_wait_for_debugger" msgid="4007354935701089555">"Подождите, пока подключится отладчик"</string>
     <string name="system_verify_apps_over_usb" msgid="7340861918835270609">"Установленные через USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="6722973410408262393">"Проверять, насколько безопасны приложения, устанавливаемые через ADB/ADT"</string>
-    <string name="system_wifi_verbose_logging" msgid="3474525355071613242">"Подробные сведения в журнале Wi-Fi"</string>
+    <string name="system_wifi_verbose_logging" msgid="3474525355071613242">"Подробный журнал Wi-Fi"</string>
     <string name="system_desc_wifi_verbose_logging" msgid="1559904751873455868">"Включить запись подробных сведений в журнал Wi-Fi"</string>
     <string name="system_show_touches" msgid="2179121368437801757">"Показывать нажатия"</string>
     <string name="system_pointer_location" msgid="2673764026490179227">"Показывать касания"</string>
diff --git a/Settings/res/values-si-rLK-notouch/strings.xml b/Settings/res/values-si-rLK-notouch/strings.xml
index bcbda90..92fbd22 100644
--- a/Settings/res/values-si-rLK-notouch/strings.xml
+++ b/Settings/res/values-si-rLK-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"ඔබ යෙදුමක් බලෙන් නැවත වුවහොත්, එය වැරදි ලෙස ක්‍රියා කරනු ඇත."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"අස්ථාපනය කරන්න"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"ඔබට මෙම යෙදුම අස්ථාපනය කිරීමට අවශ්‍යද?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"අබල කරන්න"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"මෙම යෙදුම අබල කිරීමට ඔබට අවශ්‍ය ද?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"සබල කරන්න"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"මෙම යෙදුම සබල කිරීමට ඔබට අවශ්‍ය ද?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"දත්ත හිස් කිරීම"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"සියලුම මෙම යෙදුම් වල දත්ත ස්ථීරවම මකන ලදි."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"සියලුම ගොනු, සැකසීම්, ගිණුම්, දත්ත සමුදායන් ආදිය මෙහි ඇතුළත් වේ."</string>
diff --git a/Settings/res/values-si-rLK/strings.xml b/Settings/res/values-si-rLK/strings.xml
index b982166..4784951 100644
--- a/Settings/res/values-si-rLK/strings.xml
+++ b/Settings/res/values-si-rLK/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"උපස්ථය සහ නැවත පිහිටුවීම"</string>
     <string name="device_reset" msgid="2827002349560023125">"කර්මාන්තශාලා දත්ත යළි පිහිටුම"</string>
     <string name="device_calibration" msgid="8632962533376605191">"ක්‍රමාංකණය"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"යෙදුම් බාගන්නා ලදි"</string>
     <string name="apps_system" msgid="2499191125802829425">"පද්ධති යෙදුම්"</string>
     <string name="apps_running" msgid="6430310491739956228">"ධාවනය වන යෙදුම්"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"භාෂාව"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"යතුරුපුවරුව"</string>
     <string name="system_search" msgid="2837264654143247611">"සොයන්න"</string>
-    <string name="system_security" msgid="4190058778883258927">"ආරක්ෂාව සහ සීමාකිරීම්"</string>
+    <string name="system_security" msgid="8230080273993484407">"ආරක්ෂාව සහ සීමා"</string>
     <string name="system_speech" msgid="8128688499687306982">"කථනය"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ආදාන"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ප්‍රවේශ්‍යතාව"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"පද්ධතිය යාවත්කාලීන කිරීම"</string>
     <string name="about_preference" msgid="4131396784531360434">"පිළිබඳ"</string>
     <string name="device_name" msgid="2670488158531273028">"උපාංගයේ නම"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"යළි අරඹන්න"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"නීතිමය තොරතුරු"</string>
     <string name="about_warranty" msgid="5736003473060436384">"වගකීම"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"විවෘත මූලාශ්‍ර බලපත්‍ර"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"සේවා කොන්දේසිය බලන්න"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"පෞද්ගලිකත්ව ප්‍රතිපත්තිය බලන්න"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"අමතර කොන්දේසි පෙන්වන්න"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google නීතිමය"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"බලපත්‍ර දත්ත ලබාගත නොහැක"</string>
     <string name="about_model" msgid="6625269442206323995">"අනුකෘතිය"</string>
     <string name="about_version" msgid="1177287676732287266">"අනුවාදය"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"දිනය"</string>
     <string name="system_time" msgid="6726022312605226285">"වේලාව"</string>
     <string name="system_set_date" msgid="2437586307768561116">"දිනය සකසන්න"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"දින ආකෘතිය තෝරන්න"</string>
     <string name="system_set_time" msgid="4661804115501057452">"වේලාව සකසන්න"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"වේලා කලාපය සකසන්න"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"පැය 24 ආකාරය භාවිත කරන්න"</string>
diff --git a/Settings/res/values-sk-notouch/strings.xml b/Settings/res/values-sk-notouch/strings.xml
index d531b1e..5c13e12 100644
--- a/Settings/res/values-sk-notouch/strings.xml
+++ b/Settings/res/values-sk-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ak vynútite zastavenie aplikácie, môže sa správať zvláštne."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Odinštalovať"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Chcete túto aplikáciu odinštalovať?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Zakázať"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Chcete zakázať túto aplikáciu?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Povoliť"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Chcete povoliť túto aplikáciu?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Vymazať údaje"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Všetky údaje tejto aplikácie sa natrvalo odstránia."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Zahŕňa to všetky súbory, nastavenia, účty, databázy atď."</string>
diff --git a/Settings/res/values-sk/strings.xml b/Settings/res/values-sk/strings.xml
index 2fb925f..58fe497 100644
--- a/Settings/res/values-sk/strings.xml
+++ b/Settings/res/values-sk/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Zálohovanie a obnovenie"</string>
     <string name="device_reset" msgid="2827002349560023125">"Obnovenie továrenských nastavení"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrácia"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Stiahnuté aplikácie"</string>
     <string name="apps_system" msgid="2499191125802829425">"Systémové aplikácie"</string>
     <string name="apps_running" msgid="6430310491739956228">"Spustené aplikácie"</string>
@@ -74,7 +78,7 @@
     <string name="accessory_unpair" msgid="8242725516604465355">"Zrušiť párovanie"</string>
     <string name="accessory_unpairing" msgid="7568241162181184667">"Prebieha zrušenie párovania zariadenia..."</string>
     <string name="accessory_connected" msgid="2156489304110030393">"Pripojené"</string>
-    <string name="accessories_add_title" msgid="6940361421891873321">"Prebieha vyhľadávanie príslušenstva..."</string>
+    <string name="accessories_add_title" msgid="6940361421891873321">"Vyhľadávanie príslušenstva..."</string>
     <string name="accessories_add_bluetooth_inst" msgid="5892952745770640383">"Skôr ako začnete párovať svoje zariadenia Bluetooth, presvedčte sa, že majú zapnutý režim párovania."</string>
     <string name="accessories_autopair_msg" msgid="8618829246837821752">"Našlo sa zariadenie a automaticky sa spáruje o <xliff:g id="COUNTDOWN">%1$s</xliff:g> s"</string>
     <string name="accessories_add_title_multiple" msgid="8455249961819802466">"Našlo sa viacero zariadení"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Jazyk"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Klávesnica"</string>
     <string name="system_search" msgid="2837264654143247611">"Vyhľadávanie"</string>
-    <string name="system_security" msgid="4190058778883258927">"Bezpečnosť a obmedzenia"</string>
+    <string name="system_security" msgid="8230080273993484407">"Zabezpečenie a obmedzenia"</string>
     <string name="system_speech" msgid="8128688499687306982">"Reč"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Vstupy"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Zjednodušenie ovládania"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Aktualizácia systému"</string>
     <string name="about_preference" msgid="4131396784531360434">"Informácie"</string>
     <string name="device_name" msgid="2670488158531273028">"Názov zariadenia"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Reštartovať"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Právne informácie"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Záruka"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Otvorený zdroj – licencie"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Zobraziť zmluvné podmienky"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Zobraziť pravidlá ochrany údajov"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Zobraziť ďalšie zmluvné podmienky"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Právne informácie spoločnosti Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Údaje licencie nie sú dostupné"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Verzia"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Dátum"</string>
     <string name="system_time" msgid="6726022312605226285">"Čas"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Nastavenie dátumu"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Vyberte formát dátumu"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Nastavenie času"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Nastavenie časového pásma"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Použiť 24-hodinový formát"</string>
diff --git a/Settings/res/values-sl-notouch/strings.xml b/Settings/res/values-sl-notouch/strings.xml
index 3dd864b..ed6eba2 100644
--- a/Settings/res/values-sl-notouch/strings.xml
+++ b/Settings/res/values-sl-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Če boste aplikacijo prisilno ustavili, morda ne bo pravilno delovala."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Odstrani"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Ali želite odstraniti to aplikacijo?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Onemogoči"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Želite onemogočiti to aplikacijo?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Omogoči"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Želite omogočiti to aplikacijo?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Počisti podatke"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Vsi podatki te aplikacije bodo trajno izbrisani."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"To vključuje vse datoteke, nastavitve, račune, zbirke podatkov ipd."</string>
diff --git a/Settings/res/values-sl/strings.xml b/Settings/res/values-sl/strings.xml
index 4a719ad..699de30 100644
--- a/Settings/res/values-sl/strings.xml
+++ b/Settings/res/values-sl/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Varnostno kopiranje in obnovitev"</string>
     <string name="device_reset" msgid="2827002349560023125">"Tovarniška ponastavitev"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Umerjanje"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Prenesene aplikacije"</string>
     <string name="apps_system" msgid="2499191125802829425">"Sistemske aplikacije"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aplikacije, ki se izvajajo"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Jezik"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tipkovnica"</string>
     <string name="system_search" msgid="2837264654143247611">"Iskanje"</string>
-    <string name="system_security" msgid="4190058778883258927">"Varnost in omejitve"</string>
+    <string name="system_security" msgid="8230080273993484407">"Varnost in omejitve"</string>
     <string name="system_speech" msgid="8128688499687306982">"Govor"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Vhodi"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Dostopnost"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Sistemska posodobitev"</string>
     <string name="about_preference" msgid="4131396784531360434">"Vizitka"</string>
     <string name="device_name" msgid="2670488158531273028">"Ime naprave"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Znova zaženi"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Pravne informacije"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garancija"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Odprtokodne licence"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Ogled pogojev storitve"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Ogled pravilnika o zasebnosti"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ogled dodatnih pogojev"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Googlova pravna obvestila"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Podatki o licenci niso na voljo"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Različica"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Ura"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Nastavitev datuma"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Izbira oblike datuma"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Nastavitev ure"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Nastavitev časovnega pasu"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Uporabljaj 24-urno obliko"</string>
diff --git a/Settings/res/values-sr-notouch/strings.xml b/Settings/res/values-sr-notouch/strings.xml
index e284206..ce930a7 100644
--- a/Settings/res/values-sr-notouch/strings.xml
+++ b/Settings/res/values-sr-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ако принудно зауставите апликацију, можда ће се понашати неочекивано."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Деинсталирај"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Да ли желите да деинсталирате ову апликацију?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Онемогући"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Желите ли да онемогућите ову апликацију?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Омогући"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Желите ли да омогућите ову апликацију?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Обриши податке"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Сви подаци ове апликације биће трајно избрисани."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"То обухвата све датотеке, подешавања, налоге, базе података итд."</string>
diff --git a/Settings/res/values-sr/strings.xml b/Settings/res/values-sr/strings.xml
index 690b117..60a1695 100644
--- a/Settings/res/values-sr/strings.xml
+++ b/Settings/res/values-sr/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Прављење резервне копије и враћање"</string>
     <string name="device_reset" msgid="2827002349560023125">"Ресетовање на фабричка подешавања"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калибрација"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Преузете апликације"</string>
     <string name="apps_system" msgid="2499191125802829425">"Системске апликације"</string>
     <string name="apps_running" msgid="6430310491739956228">"Покренуте апликације"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"Обично 0000 или 1234"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"Упари"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"Откажи"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google пребацивање"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"Датум и време"</string>
     <string name="system_language" msgid="2337138146114609247">"Језик"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Тастатура"</string>
     <string name="system_search" msgid="2837264654143247611">"Претражи"</string>
-    <string name="system_security" msgid="4190058778883258927">"Безбедност и ограничења"</string>
+    <string name="system_security" msgid="8230080273993484407">"Безбедност и ограничења"</string>
     <string name="system_speech" msgid="8128688499687306982">"Говор"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Улази"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Приступачност"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Ажурирање система"</string>
     <string name="about_preference" msgid="4131396784531360434">"Основни подаци"</string>
     <string name="device_name" msgid="2670488158531273028">"Назив уређаја"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Поново покрени"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Правне информације"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Гаранција"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Лиценце отвореног кода"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Прикажи услове коришћења услуге"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Прикажи политику приватности"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Прикажи додатне услове"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google правне информације"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Подаци о лиценци нису доступни"</string>
     <string name="about_model" msgid="6625269442206323995">"Модел"</string>
     <string name="about_version" msgid="1177287676732287266">"Верзија"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Датум"</string>
     <string name="system_time" msgid="6726022312605226285">"Време"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Подешавање датума"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Изаберите формат датума"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Подешавање времена"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Подешавање временске зоне"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Користи 24-часовни формат"</string>
diff --git a/Settings/res/values-sv-notouch/strings.xml b/Settings/res/values-sv-notouch/strings.xml
index c3f05b0..e45b0d9 100644
--- a/Settings/res/values-sv-notouch/strings.xml
+++ b/Settings/res/values-sv-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Om du tvingar appen att avslutas kanske den inte fungerar som den ska."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Avinstallera"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Vill du avinstallera appen?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Inaktivera"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Vill du inaktivera appen?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Aktivera"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Vill du aktivera appen?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Rensa data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Alla appens data kommer att tas bort permanent."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Det gäller alla filer, inställningar, konton, databaser osv."</string>
diff --git a/Settings/res/values-sv/strings.xml b/Settings/res/values-sv/strings.xml
index 8bb63fe..0352334 100644
--- a/Settings/res/values-sv/strings.xml
+++ b/Settings/res/values-sv/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Säkerhetskopiera och återställ"</string>
     <string name="device_reset" msgid="2827002349560023125">"Återställ standardinställningar"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrering"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Hämtade appar"</string>
     <string name="apps_system" msgid="2499191125802829425">"Systemappar"</string>
     <string name="apps_running" msgid="6430310491739956228">"Aktiva appar"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Språk"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Tangentbord"</string>
     <string name="system_search" msgid="2837264654143247611">"Sök"</string>
-    <string name="system_security" msgid="4190058778883258927">"Säkerhet och begränsningar"</string>
+    <string name="system_security" msgid="8230080273993484407">"Säkerhet och begränsningar"</string>
     <string name="system_speech" msgid="8128688499687306982">"Tal"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Ingångar"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Tillgänglighet"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Systemuppdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Om"</string>
     <string name="device_name" msgid="2670488158531273028">"Enhetens namn"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Starta om"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Juridisk information"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garanti"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Licenser, öppen källkod"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Visa användarvillkor"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Visa sekretesspolicy"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Visa tilläggsvillkor"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Juridisk information från Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Licensuppgifter saknas"</string>
     <string name="about_model" msgid="6625269442206323995">"Modell"</string>
     <string name="about_version" msgid="1177287676732287266">"Version"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Datum"</string>
     <string name="system_time" msgid="6726022312605226285">"Tid"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Ange datum"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Välj datumformat"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Ange tid"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Ange tidszon"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Använd 24-timmarsformat"</string>
@@ -288,11 +290,11 @@
     <string name="google_location_services_title" msgid="3382840371861269146">"Googles platstjänster"</string>
     <string name="third_party_location_services_title" msgid="4089136801976399147">"Platstjänster från tredje part"</string>
     <string name="location_reporting" msgid="3054236612250063073">"Platsrapportering"</string>
-    <string name="location_history" msgid="2946680949724247804">"Positionshistorik"</string>
+    <string name="location_history" msgid="2946680949724247804">"Platshistorik"</string>
     <string name="location_reporting_desc" msgid="6256424995139430823">"Google använder den här funktionen i produkter som Google Nu och Google Maps. Om du aktiverar platsrapportering tillåter du att produkterna från Google som använder den här funktionen lagrar och använder enhetens senaste platsdata i anslutning till ditt Google-konto."</string>
-    <string name="location_history_desc" msgid="3861249867748294369">"När positionshistoriken har aktiverats för kontot kan Google lagra enhetens platsdata för användning i dina appar.\n\nTill exempel kan du få vägbeskrivningar från Google Maps, och från Google Nu kan du få information om pendlingstrafiken.\n\nDu kan när som helst inaktivera positionshistoriken, men det innebär inte att den raderas. Om du vill visa och hantera positionshistoriken besöker du maps.google.com/locationhistory."</string>
-    <string name="delete_location_history_title" msgid="5804802702252280549">"Ta bort positionshistorik"</string>
-    <string name="delete_location_history_desc" msgid="4142806827237093397">"All positionshistorik från enheten som sparats i kontot tas bort. Åtgärden går inte att ångra. Vissa appar, som Google Nu, slutar fungera."</string>
+    <string name="location_history_desc" msgid="3861249867748294369">"När platshistoriken har aktiverats för kontot kan Google lagra enhetens platsdata för användning i dina appar.\n\nTill exempel kan du få vägbeskrivningar från Google Maps, och från Google Nu kan du få information om pendlingstrafiken.\n\nDu kan när som helst inaktivera platshistoriken, men det innebär inte att den raderas. Om du vill visa och hantera platshistoriken besöker du maps.google.com/locationhistory."</string>
+    <string name="delete_location_history_title" msgid="5804802702252280549">"Ta bort platshistorik"</string>
+    <string name="delete_location_history_desc" msgid="4142806827237093397">"All platshistorik från enheten som sparats i kontot tas bort. Åtgärden går inte att ångra. Vissa appar, som Google Nu, slutar fungera."</string>
     <string name="system_services" msgid="7230571820151215779">"Tjänster"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Tjänstinställningar"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Textning"</string>
diff --git a/Settings/res/values-sw-notouch/strings.xml b/Settings/res/values-sw-notouch/strings.xml
index 2644060..22cbdee 100644
--- a/Settings/res/values-sw-notouch/strings.xml
+++ b/Settings/res/values-sw-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Ukilazimisha programu kuzima, inaweza kutofanya vizuri."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Ondoa"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Unataka kusanidua programu hii?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Zima"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Je, unataka kuzima programu hii?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Washa"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Je, unataka kuwasha programu hii?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Futa data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Data yote ya programu hii itafutwa kabisa."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Hii ni pamoja na faili zote, mipangilio, akaunti, hifadhidata, nk."</string>
diff --git a/Settings/res/values-sw/arrays.xml b/Settings/res/values-sw/arrays.xml
index 982ec11..da79cf4 100644
--- a/Settings/res/values-sw/arrays.xml
+++ b/Settings/res/values-sw/arrays.xml
@@ -77,7 +77,7 @@
     <item msgid="4764344884232052861">"Serif monospace"</item>
     <item msgid="8561996903323025702">"Ya kawaida"</item>
     <item msgid="8403638572764467550">"Mwandiko ulioviringwa na kuunganishwa"</item>
-    <item msgid="5560655268137500927">"Herufi kubwa zenye umbo ndogo"</item>
+    <item msgid="5560655268137500927">"Herufi kubwa zenye umbo dogo"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4304493614734189861">"Madogo sana"</item>
@@ -90,8 +90,8 @@
     <item msgid="5333047169042840730">"Hamna"</item>
     <item msgid="7663488423233018922">"Muhtasari"</item>
     <item msgid="7891048730741670843">"Angusha kivuli"</item>
-    <item msgid="6613725572146700438">"Imeinuliwa"</item>
-    <item msgid="1007736533206905292">"Imepunguzwa"</item>
+    <item msgid="6613725572146700438">"Iliyoinuliwa"</item>
+    <item msgid="1007736533206905292">"Iliyopunguzwa"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="7311196539184412021">"25%"</item>
diff --git a/Settings/res/values-sw/strings.xml b/Settings/res/values-sw/strings.xml
index 51bf3b3..53778c1 100644
--- a/Settings/res/values-sw/strings.xml
+++ b/Settings/res/values-sw/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Hifadhi nakala na uzirejeshe"</string>
     <string name="device_reset" msgid="2827002349560023125">"Kurejesha mipangilio ya kiwandani"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Marekebisho"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Programu zilizopakuliwa"</string>
     <string name="apps_system" msgid="2499191125802829425">"Programu za mfumo"</string>
     <string name="apps_running" msgid="6430310491739956228">"Programu zinazotumika"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Lugha"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Kibodi"</string>
     <string name="system_search" msgid="2837264654143247611">"Utafutaji"</string>
-    <string name="system_security" msgid="4190058778883258927">"Usalama na Vizuizi"</string>
+    <string name="system_security" msgid="8230080273993484407">"Usalama na vizuizi"</string>
     <string name="system_speech" msgid="8128688499687306982">"Usemi"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Vifaa vya kuingiza sauti"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Ufikiaji"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Sasisho la mfumo"</string>
     <string name="about_preference" msgid="4131396784531360434">"Kuhusu"</string>
     <string name="device_name" msgid="2670488158531273028">"Jina la kifaa"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Washa upya"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Maelezo ya kisheria"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Dhima"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Leseni za programu huria"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Angalia Sheria na Masharti"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Angalia Sera ya Faragha"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Angalia Masharti ya Ziada"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Sheria za Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Data ya leseni haipatikani"</string>
     <string name="about_model" msgid="6625269442206323995">"Muundo"</string>
     <string name="about_version" msgid="1177287676732287266">"Toleo"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Tarehe"</string>
     <string name="system_time" msgid="6726022312605226285">"Saa"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Weka tarehe"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Chagua mpangilio wa tarehe"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Weka saa"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Weka saa za eneo"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Tumia mpangilio wa saa 24"</string>
diff --git a/Settings/res/values-ta-rIN-notouch/strings.xml b/Settings/res/values-ta-rIN-notouch/strings.xml
index 461496d..e18fb2f 100644
--- a/Settings/res/values-ta-rIN-notouch/strings.xml
+++ b/Settings/res/values-ta-rIN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"பயன்பாட்டை உடனே நிறுத்தினால், அது தவறாகச் செயல்படலாம்."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"நிறுவல் நீக்கு"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"பயன்பாட்டை நிறுவல் நீக்கவா?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"முடக்கு"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"பயன்பாட்டை முடக்க விரும்புகிறீர்களா?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"இயக்கு"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"பயன்பாட்டை இயக்க விரும்புகிறீர்களா?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"தரவை அழி"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"பயன்பாட்டின் எல்லா தரவும் நிரந்தரமாக நீக்கப்படும்."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"இதில் எல்லா கோப்புகளும், அமைப்புகளும், தரவுத்தளங்களும், மேலும் பலவும் அடங்கும்."</string>
diff --git a/Settings/res/values-ta-rIN/strings.xml b/Settings/res/values-ta-rIN/strings.xml
index fea164b..fb17df0 100644
--- a/Settings/res/values-ta-rIN/strings.xml
+++ b/Settings/res/values-ta-rIN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"காப்புப்பிரதி &amp; மீட்டெடுப்பு"</string>
     <string name="device_reset" msgid="2827002349560023125">"தரவின் ஆரம்பநிலை மீட்டமைப்பு"</string>
     <string name="device_calibration" msgid="8632962533376605191">"அளவுக்குறியீடு"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"இறக்கியப் பயன்பாடுகள்"</string>
     <string name="apps_system" msgid="2499191125802829425">"முறைமைப் பயன்பாடுகள்"</string>
     <string name="apps_running" msgid="6430310491739956228">"இயங்கும் பயன்பாடுகள்"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"மொழி"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"விசைப்பலகை"</string>
     <string name="system_search" msgid="2837264654143247611">"தேடு"</string>
-    <string name="system_security" msgid="4190058778883258927">"பாதுகாப்பு &amp; கட்டுப்பாடுகள்"</string>
+    <string name="system_security" msgid="8230080273993484407">"பாதுகாப்பு &amp; கட்டுப்பாடுகள்"</string>
     <string name="system_speech" msgid="8128688499687306982">"பேச்சு"</string>
     <string name="system_inputs" msgid="2413907183796651102">"உள்ளீடுகள்"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"அணுகல்தன்மை"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"முறைமை புதுப்பிப்பு"</string>
     <string name="about_preference" msgid="4131396784531360434">"அறிமுகம்"</string>
     <string name="device_name" msgid="2670488158531273028">"சாதனத்தின் பெயர்"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"மீண்டும் தொடங்கு"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"சட்டத் தகவல்"</string>
     <string name="about_warranty" msgid="5736003473060436384">"உத்தரவாதம்"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"சேவை விதிமுறைகளைக் காட்டு"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"தனியுரிமைக் கொள்கையைக் காட்டு"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"கூடுதல் விதிமுறைகளைக் காட்டு"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google சட்டம்"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"உரிமத் தரவு கிடைக்கவில்லை"</string>
     <string name="about_model" msgid="6625269442206323995">"மாடல்"</string>
     <string name="about_version" msgid="1177287676732287266">"பதிப்பு"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"தேதி"</string>
     <string name="system_time" msgid="6726022312605226285">"நேரம்"</string>
     <string name="system_set_date" msgid="2437586307768561116">"தேதியை அமை"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"தேதி வடிவமைப்பைத் தேர்வுசெய்யவும்"</string>
     <string name="system_set_time" msgid="4661804115501057452">"நேரத்தை அமை"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"நேர மண்டலத்தை அமை"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-மணிநேர வடிவத்தைப் பயன்படுத்து"</string>
@@ -292,7 +294,7 @@
     <string name="location_reporting_desc" msgid="6256424995139430823">"Google Now மற்றும் Google வரைபடம் போன்ற தயாரிப்புகளில் Google இந்த அம்சத்தைப் பயன்படுத்துகிறது. இருப்பிட அறிக்கையிடலை இயக்குவது, இந்த அம்சத்தைப் பயன்படுத்தும் எந்தவொரு Google தயாரிப்பும் உங்கள் Google கணக்குடன் தொடர்புடைய சாதனத்தின் மிகச் சமீபத்திய இருப்பிடத் தரவைப் பயன்படுத்த, சேமிக்க அனுமதிக்கிறது."</string>
     <string name="location_history_desc" msgid="3861249867748294369">"இந்தக் கணக்கிற்கு இருப்பிட வரலாறு இயக்கப்படும் போது, உங்கள் பயன்பாடுகள் பயன்படுத்துவதற்குச் சாதன இருப்பிடத் தரவை Google சேமிக்கலாம்.\n\nஎடுத்துக்காட்டாக, Google வரைபடம் திசைகளை வழங்கலாம், Google Now வழக்கமான பயணத்தில் உள்ள ட்ராஃபிக் பற்றி அறிவிக்கலாம்.\n\nஎந்த நேரத்திலும் இருப்பிட வரலாற்றை நீங்கள் முடக்கலாம், ஆனால் அவ்வாறு செய்வது சேமித்தத் தரவை நீக்காது. இருப்பிட வரலாற்றைக் கண்டு நிர்வகிக்க maps.google.com/locationhistoryஐப் பார்வையிடவும்."</string>
     <string name="delete_location_history_title" msgid="5804802702252280549">"இட வரலாற்றை நீக்கு"</string>
-    <string name="delete_location_history_desc" msgid="4142806827237093397">"Google கணக்கிற்காகச் சாதனத்தில் சேமிக்கப்பட்ட எல்லா இட வரலாற்றையும் இது நீக்கும். இதைச் செயல்தவிர்க்க முடியாது. Google Now உட்பட சில செயல்பாடுகள் செயல்படுவது நிறுத்தப்படும்."</string>
+    <string name="delete_location_history_desc" msgid="4142806827237093397">"Google கணக்கிற்காகச் சாதனத்தில் சேமிக்கப்பட்ட எல்லா இட வரலாற்றையும் இது நீக்கும். இதைத் திரும்பப்பெற முடியாது. Google Now உட்பட சில செயல்பாடுகள் செயல்படுவது நிறுத்தப்படும்."</string>
     <string name="system_services" msgid="7230571820151215779">"சேவைகள்"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"சேவை அமைப்புகள்"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"தலைப்புகள்"</string>
@@ -406,7 +408,7 @@
     <string name="disagree" msgid="9170636026862400981">"ஏற்கவில்லை"</string>
     <string name="security_unknown_sources_title" msgid="769762478057744545">"அறியப்படாத மூலங்கள்"</string>
     <string name="security_unknown_sources_desc" msgid="7197053279914817124">"Play Store ஐத் தவிர்த்து பிற ஆதாரங்களிலிருந்து பயன்பாடுகளின் நிறுவலை அனுமதி"</string>
-    <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"உங்கள் சாதனம் மற்றும் தனிப்பட்ட தரவு ஆகியவை அறியப்படாத மூலங்களிலிருந்து பெறப்பட்ட பயன்பாடுகளால் தாக்குதலுக்கு உள்ளாகக்கூடும். இந்தப் பயன்பாடுகளைப் பயன்படுத்தியதன் விளைவாக உங்கள் சாதனம் பாதிக்கப்பட்டால் அல்லது தரவை இழந்தால் அதற்கு நீங்கள் மட்டுமே பொறுப்பு என்பதை ஒப்புக்கொள்கிறீர்கள்."</string>
+    <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"உங்கள் சாதனம் மற்றும் தனிப்பட்ட தரவு ஆகியவை அறியப்படாத மூலங்களிலிருந்து பெற்ற பயன்பாடுகளால் தாக்குதலுக்கு உள்ளாகக்கூடும். இந்தப் பயன்பாடுகளைப் பயன்படுத்தியதன் விளைவாக உங்கள் சாதனம் பாதிக்கப்பட்டால் அல்லது தரவை இழந்தால் அதற்கு நீங்கள் மட்டுமே பொறுப்பு என்பதை ஒப்புக்கொள்கிறீர்கள்."</string>
     <string name="security_verify_apps_title" msgid="5787946958632254988">"பயன்பாடுகளைச் சரிபார்"</string>
     <string name="security_verify_apps_desc" msgid="1456317893117818733">"தீங்கு ஏற்படுத்தக்கூடிய பயன்பாடுகளை நிறுவ அனுமதிக்காதே அல்லது நிறுவுவதற்கு முன்பு எச்சரிக்கை செய்"</string>
   <string-array name="hdcp_checking_summaries">
diff --git a/Settings/res/values-te-rIN-notouch/strings.xml b/Settings/res/values-te-rIN-notouch/strings.xml
index ec0b4fe..eacbb10 100644
--- a/Settings/res/values-te-rIN-notouch/strings.xml
+++ b/Settings/res/values-te-rIN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"మీరు అనువర్తనాన్ని నిర్బంధంగా ఆపివేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"అన్ఇన్‌స్టాల్ చేయండి"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"మీరు ఈ అనువర్తనాన్ని అన్‌ఇన్‌స్టాల్ చేయాలనుకుంటున్నారా?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"నిలిపివేయి"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"మీరు ఈ అనువర్తనాన్ని నిలిపివేయాలనుకుంటున్నారా?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"ప్రారంభించు"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"మీరు ఈ అనువర్తనాన్ని ప్రారంభించాలనుకుంటున్నారా?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"డేటాను క్లియర్ చేయి"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ఈ అనువర్తనంలోని మొత్తం డేటా శాశ్వతంగా తొలగించబడుతుంది."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ఇందులో అన్ని ఫైల్‌లు, సెట్టింగ్‌లు, ఖాతాలు, డేటాబేస్‌లు మొదలైనవి ఉన్నాయి."</string>
diff --git a/Settings/res/values-te-rIN/strings.xml b/Settings/res/values-te-rIN/strings.xml
index de0ea31..e2819b0 100644
--- a/Settings/res/values-te-rIN/strings.xml
+++ b/Settings/res/values-te-rIN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"బ్యాకప్ &amp; పునరుద్ధరణ"</string>
     <string name="device_reset" msgid="2827002349560023125">"ఫ్యాక్టరీ డేటా రీసెట్ చేయి"</string>
     <string name="device_calibration" msgid="8632962533376605191">"క్రమాంకనం"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"డౌన్‌లోడ్ చేసిన అనువర్తనాలు"</string>
     <string name="apps_system" msgid="2499191125802829425">"సిస్టమ్ అనువర్తనాలు"</string>
     <string name="apps_running" msgid="6430310491739956228">"అమలవుతున్న అనువర్తనాలు"</string>
@@ -85,17 +89,17 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="7031117992819855434">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;తో జతచేయడానికి, అది ఈ &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; పాస్‌కీని చూపుతోందని నిర్ధారించుకోండి"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="8234127565393932499">"దీని నుండి: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ఈ పరికరానికి జత చేయాలా?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8951451728250058901">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;తో జత చేయడానికి, దానిపై &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;ని టైప్ చేయండి, ఆపై తిరిగి వెళ్లు లేదా నమోదు చేయి నొక్కండి."</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7443458826667686394">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;తో జత చేయడానికి, &lt;br&gt;పరికరానికి అవసరమైన PINను టైప్ చేయండి:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7443458826667686394">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;తో జత చేయడానికి, &lt;br&gt;పరికరానికి అవసరమైన పిన్‌ను టైప్ చేయండి:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="7980787196089653577">"దీనితో జత చేయడానికి: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;పరికర ఆవశ్యక పాస్‌కీని టైప్ చేయండి:"</string>
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"సాధారణంగా 0000 లేదా 1234"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"జత చేయి"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"రద్దు చేయి"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google ప్రసారం"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"తేదీ &amp; సమయం"</string>
     <string name="system_language" msgid="2337138146114609247">"భాష"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"కీబోర్డ్"</string>
     <string name="system_search" msgid="2837264654143247611">"శోధించండి"</string>
-    <string name="system_security" msgid="4190058778883258927">"భద్రత &amp; పరిమితులు"</string>
+    <string name="system_security" msgid="8230080273993484407">"భద్రత &amp; పరిమితులు"</string>
     <string name="system_speech" msgid="8128688499687306982">"ప్రసంగం"</string>
     <string name="system_inputs" msgid="2413907183796651102">"ఇన్‌పుట్‌లు"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"ప్రాప్యత సామర్థ్యం"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"సిస్టమ్ నవీకరణ"</string>
     <string name="about_preference" msgid="4131396784531360434">"పరిచయం"</string>
     <string name="device_name" msgid="2670488158531273028">"పరికరం పేరు"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"పునఃప్రారంభించు"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"చట్టబద్ధమైన సమాచారం"</string>
     <string name="about_warranty" msgid="5736003473060436384">"వారంటీ"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"సేవా నిబంధనలను వీక్షించండి"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"గోప్యతా విధానాన్ని వీక్షించండి"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"అదనపు నిబంధనలను వీక్షించండి"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google చట్టపరం"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"లైసెన్స్ డేటా అందుబాటులో లేదు"</string>
     <string name="about_model" msgid="6625269442206323995">"నమూనా"</string>
     <string name="about_version" msgid="1177287676732287266">"సంస్కరణ"</string>
@@ -251,8 +254,8 @@
     <string name="wifi_wps_retry_scan" msgid="6171190323753080808">"మళ్లీ ప్రయత్నించండి"</string>
     <string name="wifi_wps_title" msgid="1872305810119408482">"WPS రూటర్ కోసం శోధిస్తోంది…"</string>
     <string name="wifi_wps_instructions" msgid="3618110962669110034">"మీ రూటర్‌లో Wi-Fi సురక్షిత సెటప్ బటన్‌ను నొక్కండి.\nఇది \"WPS\" అని పిలవబడవచ్చు లేదా ఎడమవైపు గుర్తును కలిగి ఉంటుంది."</string>
-    <string name="wifi_wps_onstart_pin" msgid="594985182235834825">"మీ Wi-Fi రూటర్‌లో PIN <xliff:g id="NUMBER">%1$s</xliff:g>ని నమోదు చేయండి"</string>
-    <string name="wifi_wps_onstart_pin_description" msgid="4206001352944024353">"మీరు PINను నమోదు చేసిన తర్వాత, సెటప్‌ పూర్తి కావడానికి గరిష్టంగా 2 నిమిషాలు పట్టవచ్చు"</string>
+    <string name="wifi_wps_onstart_pin" msgid="594985182235834825">"మీ Wi-Fi రూటర్‌లో పిన్ <xliff:g id="NUMBER">%1$s</xliff:g>ని నమోదు చేయండి"</string>
+    <string name="wifi_wps_onstart_pin_description" msgid="4206001352944024353">"మీరు పిన్‌ను నమోదు చేసిన తర్వాత, సెటప్‌ పూర్తి కావడానికి గరిష్టంగా 2 నిమిషాలు పట్టవచ్చు"</string>
     <string name="wifi_wps_in_progress" msgid="7082889465182680949">"WPS ఇప్పటికే ప్రోగ్రెస్‌లో ఉంది, ముగియడానికి గరిష్టంగా 2 నిమిషాలు పట్టవచ్చు"</string>
     <string name="wifi_wps_failed_generic" msgid="8934636373182298397">"Wi-Fi రూటర్‌ను కనుగొనడం సాధ్యపడలేదు"</string>
     <string name="wifi_wps_failed_wep" msgid="9158670824165143348">"Wi-Fi రూటర్ భద్రతా సెట్టింగ్ (WEP)కి మద్దతు లేదు"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"తేదీ"</string>
     <string name="system_time" msgid="6726022312605226285">"సమయం"</string>
     <string name="system_set_date" msgid="2437586307768561116">"తేదీని సెట్ చేయండి"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"తేదీ ఆకృతిని ఎంచుకోండి"</string>
     <string name="system_set_time" msgid="4661804115501057452">"సమయాన్ని సెట్ చేయి"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"సమయ మండలిని సెట్ చేయండి"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24-గంటల ఆకృతిని ఉపయోగించు"</string>
@@ -478,7 +480,7 @@
     <string name="title_select_wifi_network" msgid="1038871400014761952">"మీ Wi-Fi నెట్‌వర్క్‌ని ఎంచుకోండి"</string>
     <string name="accessories_wifi_display_rename_device" msgid="7416728299196887186">"పేరు మార్చు"</string>
     <string name="accessories_wifi_display_enable" msgid="4779506305656453262">"Wi-Fi డిస్‌ప్లే"</string>
-    <string name="accessories_wifi_display_pin_required" msgid="3242645267864813273">"PIN అవసరం"</string>
+    <string name="accessories_wifi_display_pin_required" msgid="3242645267864813273">"పిన్ అవసరం"</string>
     <string name="accessories_remote_list_title" msgid="3115459158860792046">"రిమోట్ సమాచారం: <xliff:g id="SERIALNUMBER">%1$s</xliff:g>"</string>
     <string name="system_collecting_bug_report" msgid="5923988155158351543">"బగ్ నివేదికను సేకరిస్తోంది!\nనివేదిక తయారైన తర్వాత మేము మిమ్మల్ని మరింత సమాచారం కోసం అడుగుతాము."</string>
     <string name="system_collecting_bug_report_error" msgid="1396108342854067722">"బగ్ నివేదికను సేకరించడం సాధ్యపడలేదు!\nదయచేసి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
@@ -544,20 +546,20 @@
     <string name="restricted_profile_customize_restrictions" msgid="8418415019078825537">"పరిమితులను అనుకూలీకరించు"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="5269477581791409700">"ఒక క్షణం…"</string>
     <string name="restricted_profile_change_password_title" msgid="2848537651211816659">"పిన్‌ను మార్చండి"</string>
-    <string name="restricted_profile_set_password" msgid="3989154189940037175">"పరిమిత ప్రొఫైల్ నుండి నిష్క్రమించేందుకు ఉపయోగించడానికి కొత్త PIN కోడ్‌ను సెట్ చేయండి"</string>
-    <string name="restricted_profile_confirm_password" msgid="5749967525546068650">"పరిమిత ప్రొఫైల్ నుండి నిష్క్రమించేందుకు ఉపయోగించడానికి PIN కోడ్‌ను నిర్ధారించండి"</string>
-    <string name="restricted_profile_enter_password" msgid="5961473119032585585">"పరిమిత ప్రొఫైల్ నుండి నిష్క్రమించడానికి PIN కోడ్‌ను నమోదు చేయండి"</string>
+    <string name="restricted_profile_set_password" msgid="3989154189940037175">"పరిమిత ప్రొఫైల్ నుండి నిష్క్రమించేందుకు ఉపయోగించడానికి కొత్త పిన్ కోడ్‌ను సెట్ చేయండి"</string>
+    <string name="restricted_profile_confirm_password" msgid="5749967525546068650">"పరిమిత ప్రొఫైల్ నుండి నిష్క్రమించేందుకు ఉపయోగించడానికి పిన్ కోడ్‌ను నిర్ధారించండి"</string>
+    <string name="restricted_profile_enter_password" msgid="5961473119032585585">"పరిమిత ప్రొఫైల్ నుండి నిష్క్రమించడానికి పిన్ కోడ్‌ను నమోదు చేయండి"</string>
     <string name="restricted_profile_delete_dialog_title" msgid="2998929625283492853">"నియంత్రిత వినియోగదారుని తీసివేయాలా?"</string>
     <string name="restriction_description" msgid="3104855945910233028">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>\n<xliff:g id="VALUE">%2$s</xliff:g>"</string>
-    <string name="pin_enter_unlock_channel" msgid="5980400420298506069">"ఈ ఛానెల్‌ను చూడటానికి PINని నమోదు చేయండి"</string>
-    <string name="pin_enter_unlock_program" msgid="52453773316071511">"ఈ ప్రోగ్రామ్‌ను చూడటానికి PINని నమోదు చేయండి"</string>
-    <string name="pin_enter_pin" msgid="821552376577935497">"PIN‌ని నమోదు చేయండి"</string>
-    <string name="pin_enter_new_pin" msgid="4788218421265924211">"కొత్త PINని సెట్ చేయండి"</string>
-    <string name="pin_enter_again" msgid="1510456697040826496">"కొత్త PINని మళ్లీ నమోదు చేయండి"</string>
-    <string name="pin_enter_old_pin" msgid="851029058127630869">"పాత PINని నమోదు చేయండి"</string>
-    <string name="pin_enter_wrong" msgid="5653864140710683928">"మీరు 5 సార్లు తప్పు PINని నమోదు చేశారు.\nమళ్లీ ప్రయత్నించండి <xliff:g id="RELATIVE_TIME_SPAN">%1$s</xliff:g>."</string>
+    <string name="pin_enter_unlock_channel" msgid="5980400420298506069">"ఈ ఛానెల్‌ను చూడటానికి పిన్‌ని నమోదు చేయండి"</string>
+    <string name="pin_enter_unlock_program" msgid="52453773316071511">"ఈ ప్రోగ్రామ్‌ను చూడటానికి పిన్‌ని నమోదు చేయండి"</string>
+    <string name="pin_enter_pin" msgid="821552376577935497">"పిన్‌ని నమోదు చేయండి"</string>
+    <string name="pin_enter_new_pin" msgid="4788218421265924211">"కొత్త పిన్‌ని సెట్ చేయండి"</string>
+    <string name="pin_enter_again" msgid="1510456697040826496">"కొత్త పిన్‌ని మళ్లీ నమోదు చేయండి"</string>
+    <string name="pin_enter_old_pin" msgid="851029058127630869">"పాత పిన్‌ని నమోదు చేయండి"</string>
+    <string name="pin_enter_wrong" msgid="5653864140710683928">"మీరు 5 సార్లు తప్పు పిన్‌ని నమోదు చేశారు.\nమళ్లీ ప్రయత్నించండి <xliff:g id="RELATIVE_TIME_SPAN">%1$s</xliff:g>."</string>
     <string name="pin_button_done" msgid="939191809977197451">"సరే"</string>
     <string name="pin_button_cancel" msgid="5541414789309863965">"రద్దు"</string>
-    <string name="pin_toast_wrong" msgid="4628358195224633248">"తప్పు PIN, మళ్లీ ప్రయత్నించండి"</string>
-    <string name="pin_toast_not_match" msgid="5886041789737632996">"మళ్లీ ప్రయత్నించండి, PIN సరిపోలలేదు"</string>
+    <string name="pin_toast_wrong" msgid="4628358195224633248">"తప్పు పిన్, మళ్లీ ప్రయత్నించండి"</string>
+    <string name="pin_toast_not_match" msgid="5886041789737632996">"మళ్లీ ప్రయత్నించండి, పిన్ సరిపోలలేదు"</string>
 </resources>
diff --git a/Settings/res/values-th-notouch/strings.xml b/Settings/res/values-th-notouch/strings.xml
index 0f60eca..b84f340 100644
--- a/Settings/res/values-th-notouch/strings.xml
+++ b/Settings/res/values-th-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"หากคุณบังคับปิดแอป อาจทำให้การทำงานผิดพลาดได้"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"ถอนการติดตั้ง"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"คุณต้องการถอนการติดตั้งแอปนี้หรือไม่"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"ปิดใช้"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"ต้องการปิดใช้แอปนี้ไหม"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"เปิดใช้"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"ต้องการเปิดใช้แอปนี้ไหม"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"ล้างข้อมูล"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"ข้อมูลทั้งหมดของแอปนี้จะถูกลบอย่างถาวร"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"ข้อมูลดังกล่าวรวมถึงไฟล์ การตั้งค่า บัญชี ฐานข้อมูล เป็นต้น"</string>
diff --git a/Settings/res/values-th/strings.xml b/Settings/res/values-th/strings.xml
index d184125..6d58205 100644
--- a/Settings/res/values-th/strings.xml
+++ b/Settings/res/values-th/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"การสำรองและคืนค่าข้อมูล"</string>
     <string name="device_reset" msgid="2827002349560023125">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="device_calibration" msgid="8632962533376605191">"การเทียบมาตรฐาน"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"แอปที่ดาวน์โหลดไว้"</string>
     <string name="apps_system" msgid="2499191125802829425">"แอประบบ"</string>
     <string name="apps_running" msgid="6430310491739956228">"แอปที่ใช้งานอยู่"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"ภาษา"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"แป้นพิมพ์"</string>
     <string name="system_search" msgid="2837264654143247611">"ค้นหา"</string>
-    <string name="system_security" msgid="4190058778883258927">"ความปลอดภัยและข้อจำกัด"</string>
+    <string name="system_security" msgid="8230080273993484407">"ความปลอดภัยและข้อจำกัด"</string>
     <string name="system_speech" msgid="8128688499687306982">"คำพูด"</string>
     <string name="system_inputs" msgid="2413907183796651102">"อินพุต"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"การเข้าถึง"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"การอัปเดตระบบ"</string>
     <string name="about_preference" msgid="4131396784531360434">"เกี่ยวกับ"</string>
     <string name="device_name" msgid="2670488158531273028">"ชื่ออุปกรณ์"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"รีสตาร์ท"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"ข้อมูลทางกฎหมาย"</string>
     <string name="about_warranty" msgid="5736003473060436384">"การรับประกัน"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"สัญญาอนุญาตโอเพนซอร์ส"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"ดูข้อกำหนดในการให้บริการ"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"ดูนโยบายส่วนบุคคล"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"ดูข้อกำหนดเพิ่มเติม"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"ข้อความทางกฎหมายของ Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"ข้อมูลสัญญาอนุญาตไม่สามารถใช้ได้"</string>
     <string name="about_model" msgid="6625269442206323995">"รุ่น"</string>
     <string name="about_version" msgid="1177287676732287266">"เวอร์ชัน"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"วันที่"</string>
     <string name="system_time" msgid="6726022312605226285">"เวลา"</string>
     <string name="system_set_date" msgid="2437586307768561116">"ตั้งวันที่"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"เลือกรูปแบบวันที่"</string>
     <string name="system_set_time" msgid="4661804115501057452">"ตั้งเวลา"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"ตั้งค่าเขตเวลา"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"ใช้รูปแบบ 24 ชั่วโมง"</string>
diff --git a/Settings/res/values-tl-notouch/strings.xml b/Settings/res/values-tl-notouch/strings.xml
index 0bfe770..c337e88 100644
--- a/Settings/res/values-tl-notouch/strings.xml
+++ b/Settings/res/values-tl-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Kung sapilitan mong ihihinto ang isang app, maaari itong magloko."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"I-uninstall"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Gusto mo bang i-uninstall ang app na ito?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"I-disable"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Gusto mo bang i-disable ang app na ito?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"I-enable"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Gusto mo bang i-enable ang app na ito?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"I-clear ang data"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Permanenteng matatanggal ang lahat ng data ng app na ito."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Kasama dito ang lahat ng file, setting, account, database, atbp."</string>
diff --git a/Settings/res/values-tl/strings.xml b/Settings/res/values-tl/strings.xml
index 6fc767f..c8681a5 100644
--- a/Settings/res/values-tl/strings.xml
+++ b/Settings/res/values-tl/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"I-backup &amp; ibalik"</string>
     <string name="device_reset" msgid="2827002349560023125">"Pag-reset ng factory data"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Pag-calibrate"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Mga na-download na app"</string>
     <string name="apps_system" msgid="2499191125802829425">"Mga app ng system"</string>
     <string name="apps_running" msgid="6430310491739956228">"Mga gumaganang app"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Wika"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Keyboard"</string>
     <string name="system_search" msgid="2837264654143247611">"Paghahanap"</string>
-    <string name="system_security" msgid="4190058778883258927">"Seguridad at Mga Paghihigpit"</string>
+    <string name="system_security" msgid="8230080273993484407">"Seguridad at mga paghihigpit"</string>
     <string name="system_speech" msgid="8128688499687306982">"Speech"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Mga Input"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Pag-update ng system"</string>
     <string name="about_preference" msgid="4131396784531360434">"Tungkol dito"</string>
     <string name="device_name" msgid="2670488158531273028">"Pangalan ng device"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"I-restart"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Impormasyong legal"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Warranty"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Mga lisensya ng open source"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Tingnan ang Mga Tuntunin ng Serbisyo"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Tingnan ang Patakaran sa Privacy"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Tingnan ang Mga Karagdagang Tuntunin"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Hindi available ang data ng lisensya"</string>
     <string name="about_model" msgid="6625269442206323995">"Modelo"</string>
     <string name="about_version" msgid="1177287676732287266">"Bersyon"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Petsa"</string>
     <string name="system_time" msgid="6726022312605226285">"Oras"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Itakda ang petsa"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Pumili ng format ng petsa"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Itakda ang oras"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Itakda ang time zone"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Gumamit ng 24 na oras na format"</string>
diff --git a/Settings/res/values-tr-notouch/strings.xml b/Settings/res/values-tr-notouch/strings.xml
index 1523710..15361af 100644
--- a/Settings/res/values-tr-notouch/strings.xml
+++ b/Settings/res/values-tr-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Uygulamayı zorla durdurursanız, hatalı davranabilir."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Yüklemeyi kaldır"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Bu uygulamanın yüklemesini kaldırmak istiyor musunuz?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Devre dışı bırak"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Bu uygulamayı devre dışı bırakmak istiyor musunuz?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Etkinleştir"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Bu uygulamayı etkinleştirmek istiyor musunuz?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Verileri temizle"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Bu uygulamanın tüm verileri kalıcı olarak silinecektir."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Buna tüm dosyalar, ayarlar, hesaplar, veritabanları vb. dahildir."</string>
diff --git a/Settings/res/values-tr/strings.xml b/Settings/res/values-tr/strings.xml
index e0169c6..29fc1f6 100644
--- a/Settings/res/values-tr/strings.xml
+++ b/Settings/res/values-tr/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Yedekle ve geri yükle"</string>
     <string name="device_reset" msgid="2827002349560023125">"Fabrika verilerine sıfırla"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Kalibrasyon"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"İndirilen uygulamalar"</string>
     <string name="apps_system" msgid="2499191125802829425">"Sistem uygulamaları"</string>
     <string name="apps_running" msgid="6430310491739956228">"Çalışan uygulamalar"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Dil"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Klavye"</string>
     <string name="system_search" msgid="2837264654143247611">"Arama"</string>
-    <string name="system_security" msgid="4190058778883258927">"Güvenlik ve Kısıtlamalar"</string>
+    <string name="system_security" msgid="8230080273993484407">"Güvenlik ve kısıtlamalar"</string>
     <string name="system_speech" msgid="8128688499687306982">"Konuşma"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Girişler"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Erişilebilirlik"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Sistem güncellemesi"</string>
     <string name="about_preference" msgid="4131396784531360434">"Hakkında"</string>
     <string name="device_name" msgid="2670488158531273028">"Cihaz adı"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Yeniden başlat"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Yasal bilgiler"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Garanti"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Açık kaynak lisansları"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Hizmet Şartlarını Görüntüle"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Gizlilik Politikasını Görüntüle"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Ek Şartları Görüntüle"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google yasal"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Lisans verileri kullanılamıyor"</string>
     <string name="about_model" msgid="6625269442206323995">"Model"</string>
     <string name="about_version" msgid="1177287676732287266">"Sürüm"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Tarih"</string>
     <string name="system_time" msgid="6726022312605226285">"Saat"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Tarihi ayarla"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Tarih biçimi seçin"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Saati ayarla"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Saat dilimini ayarla"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"24 saatlik biçimi kullan"</string>
diff --git a/Settings/res/values-uk-notouch/strings.xml b/Settings/res/values-uk-notouch/strings.xml
index 5d5697b..6aab784 100644
--- a/Settings/res/values-uk-notouch/strings.xml
+++ b/Settings/res/values-uk-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Примусова зупинка програми може призвести до її неналежної роботи."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Видалити"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Видалити цю програму?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Вимкнути"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Вимкнути додаток?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Увімкнути"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Увімкнути додаток?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Очистити дані"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Усі дані цієї програми буде видалено назавжди."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Це стосується всіх файлів, налаштувань, облікових записів, баз даних тощо."</string>
diff --git a/Settings/res/values-uk/strings.xml b/Settings/res/values-uk/strings.xml
index cef25a5..62beeca 100644
--- a/Settings/res/values-uk/strings.xml
+++ b/Settings/res/values-uk/strings.xml
@@ -51,12 +51,16 @@
     <string name="device_daydream" msgid="4933581408059561077">"Заставка"</string>
     <string name="device_display" msgid="101455384386372747">"Дисплей"</string>
     <string name="device_sound_effects" msgid="7793281745920228622">"Системні звуки"</string>
-    <string name="device_apps" msgid="9180435229638772838">"Програми"</string>
+    <string name="device_apps" msgid="9180435229638772838">"Додатки"</string>
     <string name="device_storage_reset" msgid="1425978936501134425">"Пам’ять і скидання"</string>
     <string name="device_storage" msgid="5536683600091277826">"Пам’ять"</string>
     <string name="device_backup_restore" msgid="5627523987587511884">"Резервне копіювання та відновлення"</string>
     <string name="device_reset" msgid="2827002349560023125">"Заводські налаштування"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Калібрування"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Завантажені додатки"</string>
     <string name="apps_system" msgid="2499191125802829425">"Системні додатки"</string>
     <string name="apps_running" msgid="6430310491739956228">"Запущені додатки"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Мова"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Клавіатура"</string>
     <string name="system_search" msgid="2837264654143247611">"Пошук"</string>
-    <string name="system_security" msgid="4190058778883258927">"Безпека та обмеження"</string>
+    <string name="system_security" msgid="8230080273993484407">"Безпека й обмеження"</string>
     <string name="system_speech" msgid="8128688499687306982">"Мовлення"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Джерела вхідного сигналу"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Доступність"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Оновлення системи"</string>
     <string name="about_preference" msgid="4131396784531360434">"Інфо"</string>
     <string name="device_name" msgid="2670488158531273028">"Назва пристрою"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Перезапустити"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Правова інформація"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Гарантія"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Ліцензії з відкритим кодом"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Умови використання"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Політика конфіденційності"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Додаткові умови"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Юридичні умови Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Дані ліцензії недоступні"</string>
     <string name="about_model" msgid="6625269442206323995">"Модель"</string>
     <string name="about_version" msgid="1177287676732287266">"Версія"</string>
@@ -241,7 +244,7 @@
     <string name="storage_available" msgid="1241005580092138871">"Доступно"</string>
     <string name="storage_size" msgid="8958530823208352781">"Загальний обсяг: <xliff:g id="TOTAL_SPACE">%1$s</xliff:g>"</string>
     <string name="storage_calculating_size" msgid="2644732407412520565">"Обчислення…"</string>
-    <string name="storage_apps_usage" msgid="4366049071039081219">"Програми"</string>
+    <string name="storage_apps_usage" msgid="4366049071039081219">"Додатки"</string>
     <string name="storage_downloads_usage" msgid="6172975879962599380">"Завантаження"</string>
     <string name="storage_dcim_usage" msgid="2977564696540645452">"Фотографії та відео"</string>
     <string name="storage_music_usage" msgid="3509327591741514083">"Аудіо"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Дата"</string>
     <string name="system_time" msgid="6726022312605226285">"Час"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Установити дату"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Вибрати формат дати"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Установити час"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Установити часовий пояс"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Використовувати 24-годинний формат"</string>
@@ -343,7 +345,7 @@
     <string name="system_input" msgid="6164987320529039626">"Введення даних"</string>
     <string name="system_drawing" msgid="6573389872154957039">"Рисування"</string>
     <string name="system_monitoring" msgid="8424072546138094053">"Контроль"</string>
-    <string name="system_apps" msgid="6293850468968494924">"Програми"</string>
+    <string name="system_apps" msgid="6293850468968494924">"Додатки"</string>
     <string name="system_take_bug_report" msgid="3550575498907672342">"Зробити звіт про помилки"</string>
     <string name="system_backup_password" msgid="6622796686823406402">"Пароль резервної копії"</string>
     <string name="system_stay_awake" msgid="1212296404230848490">"Залишатись активним"</string>
diff --git a/Settings/res/values-vi-notouch/strings.xml b/Settings/res/values-vi-notouch/strings.xml
index 1fa7b17..7256a0e 100644
--- a/Settings/res/values-vi-notouch/strings.xml
+++ b/Settings/res/values-vi-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động sai."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Gỡ cài đặt"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Bạn có muốn gỡ cài đặt ứng dụng này không?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Tắt"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Bạn có muốn tắt ứng dụng này không?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Bật"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Bạn có muốn bật ứng dụng này không?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Xóa dữ liệu"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Tất cả dữ liệu của ứng dụng này sẽ bị xóa vĩnh viễn."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Các dữ liệu bị xóa bao gồm tất cả các tệp, cài đặt, tài khoản, cơ sở dữ liệu, v.v."</string>
diff --git a/Settings/res/values-vi/arrays.xml b/Settings/res/values-vi/arrays.xml
index 2591d8a..9782346 100644
--- a/Settings/res/values-vi/arrays.xml
+++ b/Settings/res/values-vi/arrays.xml
@@ -90,8 +90,8 @@
     <item msgid="5333047169042840730">"Không có"</item>
     <item msgid="7663488423233018922">"Viền ngoài"</item>
     <item msgid="7891048730741670843">"Bóng đổ"</item>
-    <item msgid="6613725572146700438">"Tăng"</item>
-    <item msgid="1007736533206905292">"Giảm"</item>
+    <item msgid="6613725572146700438">"Nổi"</item>
+    <item msgid="1007736533206905292">"Chìm"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="7311196539184412021">"25%"</item>
diff --git a/Settings/res/values-vi/strings.xml b/Settings/res/values-vi/strings.xml
index 9294ff7..16cf7f9 100644
--- a/Settings/res/values-vi/strings.xml
+++ b/Settings/res/values-vi/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Sao lưu và khôi phục"</string>
     <string name="device_reset" msgid="2827002349560023125">"Thiết lập lại dữ liệu ban đầu"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Hiệu chỉnh"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Ứng dụng đã tải xuống"</string>
     <string name="apps_system" msgid="2499191125802829425">"Ứng dụng hệ thống"</string>
     <string name="apps_running" msgid="6430310491739956228">"Ứng dụng đang chạy"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Ngôn ngữ"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Bàn phím"</string>
     <string name="system_search" msgid="2837264654143247611">"Tìm kiếm"</string>
-    <string name="system_security" msgid="4190058778883258927">"Bảo mật và hạn chế"</string>
+    <string name="system_security" msgid="8230080273993484407">"Bảo mật và hạn chế"</string>
     <string name="system_speech" msgid="8128688499687306982">"Giọng nói"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Đầu vào"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Trợ năng"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Bản cập nhật hệ thống"</string>
     <string name="about_preference" msgid="4131396784531360434">"Giới thiệu"</string>
     <string name="device_name" msgid="2670488158531273028">"Tên thiết bị"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Khởi động lại"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Thông tin pháp lý"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Bảo hành"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Giấy phép nguồn mở"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Xem điều khoản dịch vụ"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Xem chính sách bảo mật"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Xem điều khoản bổ sung"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Chính sách pháp lý của Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Hiện không có dữ liệu về giấy phép"</string>
     <string name="about_model" msgid="6625269442206323995">"Mẫu"</string>
     <string name="about_version" msgid="1177287676732287266">"Phiên bản"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Ngày"</string>
     <string name="system_time" msgid="6726022312605226285">"Thời gian"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Đặt ngày"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Chọn định dạng ngày"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Đặt giờ"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Đặt múi giờ"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Sử dụng định dạng 24 giờ"</string>
diff --git a/Settings/res/values-zh-rCN-notouch/strings.xml b/Settings/res/values-zh-rCN-notouch/strings.xml
index ccb8049..a5257df 100644
--- a/Settings/res/values-zh-rCN-notouch/strings.xml
+++ b/Settings/res/values-zh-rCN-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"强行停止某个应用可能会导致其出现异常。"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"卸载"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"要卸载此应用吗?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"停用"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"要停用此应用吗?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"启用"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"要启用此应用吗?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"清除数据"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"此应用的所有数据都将被永久删除。"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"这包括所有文件、设置、帐户、数据库等"</string>
@@ -46,7 +50,7 @@
     <string name="device_daydreams_sleep_description" msgid="8438730889852772376">"设备闲置一段时间后,系统会启动互动屏保。如果未选择互动屏保,屏幕将会自动关闭。"</string>
     <string name="device_daydreams_sleep_summary" msgid="4442691086777437088">"闲置<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g>后"</string>
     <string name="device_daydreams_screen_off" msgid="1846621864054404830">"何时休眠"</string>
-    <string name="device_daydreams_screen_off_description" msgid="7699124270812914310">"如果在这个时间段内无任何操作,屏幕将会自动关闭。"</string>
+    <string name="device_daydreams_screen_off_description" msgid="7699124270812914310">"如果在这段时间内无任何操作,屏幕将会自动关闭。"</string>
     <string name="device_daydreams_screen_off_summary" msgid="6350806465141059041">"互动屏保运行<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g>后"</string>
     <string name="backup_configure_account_default_summary" msgid="2013649183664358673">"目前没有存储备份数据的帐户"</string>
     <string name="backup_erase_dialog_title" msgid="8900389956460363471"></string>
diff --git a/Settings/res/values-zh-rCN/strings.xml b/Settings/res/values-zh-rCN/strings.xml
index d5dfd18..779a572 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"备份和还原"</string>
     <string name="device_reset" msgid="2827002349560023125">"恢复出厂设置"</string>
     <string name="device_calibration" msgid="8632962533376605191">"校准"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"已下载的应用"</string>
     <string name="apps_system" msgid="2499191125802829425">"系统应用"</string>
     <string name="apps_running" msgid="6430310491739956228">"正在运行的应用"</string>
@@ -95,21 +99,20 @@
     <string name="system_language" msgid="2337138146114609247">"语言"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"键盘"</string>
     <string name="system_search" msgid="2837264654143247611">"搜索"</string>
-    <string name="system_security" msgid="4190058778883258927">"安全和限制"</string>
+    <string name="system_security" msgid="8230080273993484407">"安全和限制"</string>
     <string name="system_speech" msgid="8128688499687306982">"语音"</string>
     <string name="system_inputs" msgid="2413907183796651102">"输入端口"</string>
-    <string name="system_accessibility" msgid="6215431399759498005">"辅助功能"</string>
+    <string name="system_accessibility" msgid="6215431399759498005">"无障碍"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"开发者选项"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"无"</string>
     <string name="about_system_update" msgid="7282772247661356586">"系统更新"</string>
     <string name="about_preference" msgid="4131396784531360434">"关于"</string>
     <string name="device_name" msgid="2670488158531273028">"设备名称"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"重新启动"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"法律信息"</string>
     <string name="about_warranty" msgid="5736003473060436384">"保修信息"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"开放源代码许可"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"查看服务条款"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"查看隐私权政策"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"查看附加条款"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google 法律信息"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"无法获取许可数据"</string>
     <string name="about_model" msgid="6625269442206323995">"型号"</string>
     <string name="about_version" msgid="1177287676732287266">"版本"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"日期"</string>
     <string name="system_time" msgid="6726022312605226285">"时间"</string>
     <string name="system_set_date" msgid="2437586307768561116">"设置日期"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"选择日期格式"</string>
     <string name="system_set_time" msgid="4661804115501057452">"设置时间"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"设置时区"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"使用24小时格式"</string>
diff --git a/Settings/res/values-zh-rHK-notouch/strings.xml b/Settings/res/values-zh-rHK-notouch/strings.xml
index 4acd1d2..913d2db 100644
--- a/Settings/res/values-zh-rHK-notouch/strings.xml
+++ b/Settings/res/values-zh-rHK-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"如果您強制停止應用程式,應用程式或會不能正常操作。"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"解除安裝"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"您要解除安裝這個應用程式嗎?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"停用"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"您想要停用這個應用程式嗎?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"啟用"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"您想要啟用這個應用程式嗎?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"清除資料"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"這個應用程序的所有數據將被永久刪除。"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"包括所有檔案、設定、帳戶、資料庫等。"</string>
diff --git a/Settings/res/values-zh-rHK/strings.xml b/Settings/res/values-zh-rHK/strings.xml
index e437e08..25210aa 100644
--- a/Settings/res/values-zh-rHK/strings.xml
+++ b/Settings/res/values-zh-rHK/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"備份與還原"</string>
     <string name="device_reset" msgid="2827002349560023125">"恢復原廠設定"</string>
     <string name="device_calibration" msgid="8632962533376605191">"校正"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"已下載的應用程式"</string>
     <string name="apps_system" msgid="2499191125802829425">"系統應用程式"</string>
     <string name="apps_running" msgid="6430310491739956228">"執行中的應用程式"</string>
@@ -90,12 +94,12 @@
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"通常是 0000 或 1234"</string>
     <string name="bluetooth_pair" msgid="7836818609620478122">"配對"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"取消"</string>
-    <string name="system_cast" msgid="6421567823845207156">"Google 投放"</string>
+    <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"日期和時間"</string>
     <string name="system_language" msgid="2337138146114609247">"語言"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"鍵盤"</string>
     <string name="system_search" msgid="2837264654143247611">"搜尋"</string>
-    <string name="system_security" msgid="4190058778883258927">"安全性和限制"</string>
+    <string name="system_security" msgid="8230080273993484407">"安全和限制"</string>
     <string name="system_speech" msgid="8128688499687306982">"語音"</string>
     <string name="system_inputs" msgid="2413907183796651102">"輸入"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"協助工具"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"系統更新"</string>
     <string name="about_preference" msgid="4131396784531360434">"關於"</string>
     <string name="device_name" msgid="2670488158531273028">"裝置名稱"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"重新啟動"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"法律資訊"</string>
     <string name="about_warranty" msgid="5736003473060436384">"保用"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"開放原始碼授權"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"查看服務條款"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"查看私隱權政策"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"查看附加條款"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google 法律條款"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"無法提供授權資料"</string>
     <string name="about_model" msgid="6625269442206323995">"模型"</string>
     <string name="about_version" msgid="1177287676732287266">"版本"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"日期"</string>
     <string name="system_time" msgid="6726022312605226285">"時間"</string>
     <string name="system_set_date" msgid="2437586307768561116">"設定日期"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"選擇日期格式"</string>
     <string name="system_set_time" msgid="4661804115501057452">"設定時間"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"設定時區"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"使用 24 小時制"</string>
diff --git a/Settings/res/values-zh-rTW-notouch/strings.xml b/Settings/res/values-zh-rTW-notouch/strings.xml
index ca576f3..4ae1855 100644
--- a/Settings/res/values-zh-rTW-notouch/strings.xml
+++ b/Settings/res/values-zh-rTW-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"如果您強制停止應用程式,應用程式可能無法正常運作。"</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"解除安裝"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"您要解除安裝這個應用程式嗎?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"停用"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"您要停用這個應用程式嗎?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"啟用"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"您要啟用這個應用程式嗎?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"清除資料"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"這個應用程式的資料將會全部遭到永久刪除。"</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"包括所有檔案、設定、帳戶、資料庫等。"</string>
diff --git a/Settings/res/values-zh-rTW/strings.xml b/Settings/res/values-zh-rTW/strings.xml
index ff51a04..50bf77d 100644
--- a/Settings/res/values-zh-rTW/strings.xml
+++ b/Settings/res/values-zh-rTW/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"備份與還原"</string>
     <string name="device_reset" msgid="2827002349560023125">"恢復原廠設定"</string>
     <string name="device_calibration" msgid="8632962533376605191">"校正"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"已下載的應用程式"</string>
     <string name="apps_system" msgid="2499191125802829425">"系統應用程式"</string>
     <string name="apps_running" msgid="6430310491739956228">"執行中的應用程式"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"語言"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"鍵盤"</string>
     <string name="system_search" msgid="2837264654143247611">"搜尋"</string>
-    <string name="system_security" msgid="4190058778883258927">"安全性與限制"</string>
+    <string name="system_security" msgid="8230080273993484407">"安全性與限制"</string>
     <string name="system_speech" msgid="8128688499687306982">"語音"</string>
     <string name="system_inputs" msgid="2413907183796651102">"輸入裝置"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"協助工具"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"系統更新"</string>
     <string name="about_preference" msgid="4131396784531360434">"關於"</string>
     <string name="device_name" msgid="2670488158531273028">"裝置名稱"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"重新啟動"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"法律資訊"</string>
     <string name="about_warranty" msgid="5736003473060436384">"保固"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"開放原始碼授權"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"查看服務條款"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"查看隱私權政策"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"查看附加條款"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Google 法律條款"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"無法提供授權資料"</string>
     <string name="about_model" msgid="6625269442206323995">"型號"</string>
     <string name="about_version" msgid="1177287676732287266">"版本"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"日期"</string>
     <string name="system_time" msgid="6726022312605226285">"時間"</string>
     <string name="system_set_date" msgid="2437586307768561116">"設定日期"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"選擇日期格式"</string>
     <string name="system_set_time" msgid="4661804115501057452">"設定時間"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"設定時區"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"使用 24 小時制"</string>
diff --git a/Settings/res/values-zu-notouch/strings.xml b/Settings/res/values-zu-notouch/strings.xml
index 8636fe6..beebd64 100644
--- a/Settings/res/values-zu-notouch/strings.xml
+++ b/Settings/res/values-zu-notouch/strings.xml
@@ -26,6 +26,10 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="221435219644064243">"Uma uphoqa ukumisa uhlelo lokusebenza, kungenzeka liziphathe kabi."</string>
     <string name="device_apps_app_management_uninstall" msgid="6054050725055974790">"Khipha"</string>
     <string name="device_apps_app_management_uninstall_desc" msgid="3542570994262234511">"Ufuna ukukhipha lolu hlelo lokusebenza?"</string>
+    <string name="device_apps_app_management_disable" msgid="1461984395121717076">"Khubaza"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1362228583828208991">"Ufuna ukukhubaza lolu hlelo lokusebenza?"</string>
+    <string name="device_apps_app_management_enable" msgid="8794752872502256633">"Nika amandla"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="6449017972628203288">"Ufuna ukunika amandla lolu hlelo lokusebenza?"</string>
     <string name="device_apps_app_management_clear_data" msgid="8288695583331012586">"Sula idatha"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="2197842469669426232">"Yonke le datha yohlelo lokusebenza izosuswa ngokuphelele."</string>
     <string name="device_apps_app_management_clear_data_what" msgid="376666756087041021">"Lokhu kuhlanganisa wonke amafayela, ama-akhawunti, imininingo egciniwe, njll."</string>
diff --git a/Settings/res/values-zu/strings.xml b/Settings/res/values-zu/strings.xml
index 08f057f..3e083a9 100644
--- a/Settings/res/values-zu/strings.xml
+++ b/Settings/res/values-zu/strings.xml
@@ -57,6 +57,10 @@
     <string name="device_backup_restore" msgid="5627523987587511884">"Yenza isipele futhi ubuyisele esimweni"</string>
     <string name="device_reset" msgid="2827002349560023125">"Ukusetha kabusha yonke idatha"</string>
     <string name="device_calibration" msgid="8632962533376605191">"Ukusika"</string>
+    <!-- no translation found for device_storage_clear_cache_title (3365635664766067643) -->
+    <skip />
+    <!-- no translation found for device_storage_clear_cache_message (6495570470005696210) -->
+    <skip />
     <string name="apps_downloaded" msgid="4222190849854323480">"Izinhlelo zokusebenza ezilandiwe"</string>
     <string name="apps_system" msgid="2499191125802829425">"Uhlelo lokusebenza lwesistimu"</string>
     <string name="apps_running" msgid="6430310491739956228">"Izinhlelo zokusebenza ezisebenzayo"</string>
@@ -95,7 +99,7 @@
     <string name="system_language" msgid="2337138146114609247">"Ulimi"</string>
     <string name="system_keyboard" msgid="7680159735294672514">"Ikhibhodi"</string>
     <string name="system_search" msgid="2837264654143247611">"Sesha"</string>
-    <string name="system_security" msgid="4190058778883258927">"Ukuvikeleka nokukhawulelwa"</string>
+    <string name="system_security" msgid="8230080273993484407">"Ukuvikeleka nokukhawulela"</string>
     <string name="system_speech" msgid="8128688499687306982">"Inkulumo"</string>
     <string name="system_inputs" msgid="2413907183796651102">"Okokufaka"</string>
     <string name="system_accessibility" msgid="6215431399759498005">"Ukufinyeleleka"</string>
@@ -104,12 +108,11 @@
     <string name="about_system_update" msgid="7282772247661356586">"Ukubuyekeza isistimu"</string>
     <string name="about_preference" msgid="4131396784531360434">"Mayelana"</string>
     <string name="device_name" msgid="2670488158531273028">"Igama ledivayisi"</string>
+    <string name="restart_button_label" msgid="8153112858638352970">"Qala phansi"</string>
     <string name="about_legal_info" msgid="8511870741437307531">"Uwazi olusemthethweni"</string>
     <string name="about_warranty" msgid="5736003473060436384">"Isiqinisekiso"</string>
     <string name="about_legal_license" msgid="7867205982113209033">"Amalayisense womthombo ovulekile"</string>
-    <string name="about_terms_of_service" msgid="3025043473995690659">"Buka imigomo yesevisi"</string>
-    <string name="about_privacy_policy" msgid="7104996228479152643">"Buka inqubomgomo yobumfihlo"</string>
-    <string name="about_additional_terms" msgid="1769540499832401944">"Buka imigomo engeziwe"</string>
+    <string name="about_terms_of_service" msgid="7743088207977334874">"Ezomthetho ze-Google"</string>
     <string name="about_license_activity_unavailable" msgid="8522566562321418498">"Idatha yelayisense ayitholakali"</string>
     <string name="about_model" msgid="6625269442206323995">"Imodeli"</string>
     <string name="about_version" msgid="1177287676732287266">"Inguqulo"</string>
@@ -261,7 +264,6 @@
     <string name="system_date" msgid="2767108116769558081">"Idethi"</string>
     <string name="system_time" msgid="6726022312605226285">"Isikhathi"</string>
     <string name="system_set_date" msgid="2437586307768561116">"Setha idethi"</string>
-    <string name="system_choose_date_format" msgid="7690908744371594279">"Khetha ifomethi yedethi"</string>
     <string name="system_set_time" msgid="4661804115501057452">"Setha isikhathi"</string>
     <string name="system_set_time_zone" msgid="8239601932757697259">"Setha umkhawulo wesikhathi"</string>
     <string name="system_set_time_format" msgid="4447882066895090612">"Sebenzisa ifomethi yamahora angu-24"</string>
diff --git a/Settings/res/values/attrs.xml b/Settings/res/values/attrs.xml
index b5bfefd..65eca4f 100644
--- a/Settings/res/values/attrs.xml
+++ b/Settings/res/values/attrs.xml
@@ -64,7 +64,7 @@
         selectedSize,  use ScrollAdapterCustomSize. <p>
         The value can be used in two cases: <p>
         - when selectedTakesMoreSpace is true:  ScrollAdapterView will allocate more
-        spaces surrounding the focused item.  The extra spaces is added to left/right
+        spaces surrounding the focused item.  The extra spaces is added to start/end
         depending on "scrollItemAlign". <p>
         - when selectedTakesMoreSpace is false: ScrollAdapterView will not allocate
         more spaces for focused item,  but will align the focused item using the value. <p>
@@ -85,11 +85,11 @@
             client area (size - padding) by default.  But you can also use scrollCenterOffset
             or scrollCenterOffsetPercent to customize it-->
             <enum name="keepCenter" value="0" />
-            <!-- keep scroll center as a fixed distance from left/top -->
+            <!-- keep scroll center as a fixed distance from start/top -->
             <enum name="fixed" value="1" />
             <!-- keep scroll center offset from the center of the view -->
             <enum name="fixedPercent" value="2"/>
-            <!-- keep scroll center as a fixed distance from right/bottom -->
+            <!-- keep scroll center as a fixed distance from end/bottom -->
             <enum name="fixedToEnd" value="3" />
         </attr>
 
@@ -103,9 +103,9 @@
         <attr name="scrollItemAlign">
             <!-- align the center of selected item -->
             <enum name="center" value="0" />
-            <!-- align the left/up edge of selected item -->
+            <!-- align the start/up edge of selected item -->
             <enum name="low" value="1" />
-            <!-- align the right/down edge of selected item -->
+            <!-- align the end/down edge of selected item -->
             <enum name="high" value="2" />
         </attr>
 
@@ -116,13 +116,13 @@
         <attr name="lerperDivisor" format="float" />
 
         <!--
-          distance based transform for the views on the left/top of center position,
+          distance based transform for the views on the start/top of center position,
           the duration is interpreted as "dip" instead of milliseconds
         -->
         <attr name="lowItemTransform" format="reference" />
 
         <!--
-          distance based transform for the views on the right/down of center position,
+          distance based transform for the views on the end/down of center position,
           the duration is interpreted as "dip" instead of milliseconds
         -->
         <attr name="highItemTransform" format="reference" />
diff --git a/Settings/res/values/config.xml b/Settings/res/values/config.xml
index 565cde3..95a5e4b 100644
--- a/Settings/res/values/config.xml
+++ b/Settings/res/values/config.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <bool name="multiple_accounts_enabled">false</bool>
     <integer name="settings_fade_in_duration">350</integer>
     <integer name="settings_fade_out_duration">350</integer>
     <integer name="action_title_max_lines">3</integer>
diff --git a/Settings/res/values/dimens.xml b/Settings/res/values/dimens.xml
index b1d9b43..7a2e6cb 100644
--- a/Settings/res/values/dimens.xml
+++ b/Settings/res/values/dimens.xml
@@ -55,8 +55,8 @@
     <dimen name="settings_list_padding_vertical">120dp</dimen>
     <dimen name="settings_list_fade_length">30dp</dimen>
     <dimen name="app_management_content_select_padding">10dp</dimen>
-    <dimen name="app_icon_margin_left">50dp</dimen>
-    <dimen name="app_icon_margin_right">40dp</dimen>
+    <dimen name="app_icon_margin_start">50dp</dimen>
+    <dimen name="app_icon_margin_end">40dp</dimen>
     <dimen name="app_icon_list_margin_bottom">10dp</dimen>
     <dimen name="network_list_height">192dp</dimen>
     <dimen name="network_list_width">128dp</dimen>
@@ -65,8 +65,8 @@
     <dimen name="device_storage_usage_indicator_width">32dip</dimen>
     <dimen name="device_storage_usage_indicator_height">32dip</dimen>
     <dimen name="action_min_height">80dp</dimen>
-    <dimen name="add_accessory_padding_left">50dp</dimen>
-    <dimen name="bt_secure_pair_hint_left_margin">5dp</dimen>
+    <dimen name="add_accessory_padding_start">50dp</dimen>
+    <dimen name="bt_secure_pair_hint_start_margin">5dp</dimen>
     <dimen name="bt_secure_pair_hint_top_margin">3dp</dimen>
 
     <integer name="captioning_preview_default_font_size">48</integer>
@@ -80,6 +80,7 @@
     <item name="legacy_app_item_unfocused_alpha" type="dimen">70%</item>
 
     <dimen name="browse_item_title_font_size">16sp</dimen>
+    <dimen name="browse_item_title_font_size_small">12sp</dimen>
     <dimen name="browse_item_description_font_size">14sp</dimen>
     <dimen name="browse_item_bottom_padding">12dp</dimen>
 
@@ -87,8 +88,8 @@
     <dimen name="lb_action_fragment_selector_min_height">8dp</dimen>
     <dimen name="lb_dialog_list_item_min_height">64dp</dimen>
     <dimen name="lb_dialog_list_item_vertical_padding">12dp</dimen>
-    <dimen name="lb_dialog_list_item_left_padding">20dp</dimen>
-    <dimen name="lb_dialog_list_item_right_padding">28dp</dimen>
+    <dimen name="lb_dialog_list_item_start_padding">20dp</dimen>
+    <dimen name="lb_dialog_list_item_end_padding">28dp</dimen>
     <dimen name="lb_dialog_list_item_checkmark_diameter">8dp</dimen>
     <dimen name="lb_dialog_list_item_delimiter_padding">4dp</dimen>
     <integer name="lb_dialog_action_title_min_lines">1</integer>
@@ -103,7 +104,7 @@
     <dimen name="lb_dialog_list_item_description_font_size">12sp</dimen>
     <dimen name="lb_content_fragment_title_text_bottom_padding">4dp</dimen>
     <dimen name="lb_content_section_width">576dp</dimen>
-    <dimen name="lb_content_fragment_left_padding">48dp</dimen>
+    <dimen name="lb_content_fragment_start_padding">48dp</dimen>
     <dimen name="lb_content_fragment_delimiter_padding">16dp</dimen>
     <dimen name="lb_content_fragment_max_icon_height">280dp</dimen>
     <dimen name="lb_content_fragment_title_text_top_padding">2dp</dimen>
@@ -159,7 +160,7 @@
     <dimen name="content_fragment_icon_height">140dp</dimen>
     <dimen name="content_fragment_badge_icon_width">48dp</dimen>
     <dimen name="content_fragment_badge_icon_height">48dp</dimen>
-    <dimen name="content_fragment_left_padding">48dp</dimen>
+    <dimen name="content_fragment_start_padding">48dp</dimen>
     <dimen name="content_fragment_max_icon_height">280dp</dimen>
     <dimen name="content_fragment_title_text_bottom_padding">4dp</dimen>
     <dimen name="content_fragment_title_text_size">36sp</dimen>
@@ -170,40 +171,41 @@
     <dimen name="indeterminate_bottom_padding">4dp</dimen>
 
     <dimen name="list_item_badge_icon_height">18dp</dimen>
-    <dimen name="list_item_badge_icon_margin_left">8dp</dimen>
+    <dimen name="list_item_badge_icon_margin_start">8dp</dimen>
     <dimen name="list_item_badge_icon_width">18dp</dimen>
     <dimen name="list_item_checkmark_diameter">8dp</dimen>
     <dimen name="list_item_delimiter_padding">4dp</dimen>
     <dimen name="list_item_description_font_size">12sp</dimen>
     <dimen name="list_item_height">48dp</dimen>
     <dimen name="list_item_icon_big_height">80dp</dimen>
-    <dimen name="list_item_icon_big_margin_right">8dp</dimen>
+    <dimen name="list_item_icon_big_margin_end">8dp</dimen>
     <dimen name="list_item_icon_big_width">80dp</dimen>
     <dimen name="list_item_icon_height">32dp</dimen>
     <dimen name="list_item_icon_size">32dp</dimen>
     <dimen name="list_item_icon_small_height">24dp</dimen>
     <dimen name="list_item_icon_small_width">24dp</dimen>
     <dimen name="list_item_icon_width">32dp</dimen>
-    <dimen name="list_item_left_padding">20dp</dimen>
+    <dimen name="list_item_start_padding">20dp</dimen>
     <dimen name="list_item_min_height">64dp</dimen>
-    <dimen name="list_item_right_padding">28dp</dimen>
+    <dimen name="list_item_end_padding">28dp</dimen>
     <dimen name="list_item_timestamp_font_size">12sp</dimen>
     <dimen name="list_item_title_font_size">18sp</dimen>
     <dimen name="list_item_vertical_padding">12dp</dimen>
 
-    <dimen name="pad_left_unsafe_action">56dp</dimen>
-    <dimen name="pad_left_unsafe_description">56dp</dimen>
-    <dimen name="pad_right_unsafe_action">56dp</dimen>
+    <dimen name="pad_start_unsafe_action">56dp</dimen>
+    <dimen name="pad_start_unsafe_description">56dp</dimen>
+    <dimen name="pad_end_unsafe_action">56dp</dimen>
     <dimen name="pad_top_unsafe_progress">32dp</dimen>
 
     <dimen name="picker_column_height">192dp</dimen>
     <dimen name="picker_column_horizontal_padding">8dp</dimen>
     <dimen name="picker_item_height">64dp</dimen>
-    <dimen name="picker_left_padding">24dp</dimen>
+    <dimen name="picker_start_padding">24dp</dimen>
     <dimen name="picker_separator_horizontal_padding">4dp</dimen>
 
     <dimen name="setup_activity_overscan_margin">48dp</dimen>
     <dimen name="setup_scroll_list_top_padding">0dp</dimen>
+    <dimen name="setup_list_item_icon_margin_end">8dp</dimen>
     <dimen name="setup_title_height">285dp</dimen>
     <dimen name="tos_webview_padding_without_progress_bar">40dp</dimen>
     <dimen name="tos_webview_padding_with_progress_bar">80dp</dimen>
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index bc80cc1..b208f1e 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -107,6 +107,11 @@
     <!-- Preference which sets the device's display calibration. [CHAR LIMIT=50] -->
     <string name="device_calibration">Calibration</string>
 
+        <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+    <string name="device_storage_clear_cache_title">Clear cached data?</string>
+    <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+    <string name="device_storage_clear_cache_message">This will clear cached data for all apps.</string>
+
     <!-- Browse Header for downloaded apps under device settings. [CHAR LIMIT=50] -->
     <string name="apps_downloaded">Downloaded apps</string>
     <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
@@ -195,7 +200,7 @@
     <!-- Preference which manages search and google now settings. [CHAR LIMIT=50] -->
     <string name="system_search">Search</string>
     <!-- Preference which manages security settings. [CHAR LIMIT=50] -->
-    <string name="system_security">Security &amp; Restrictions</string>
+    <string name="system_security">Security &amp; restrictions</string>
     <!-- Preference which manages speech recognition settings. [CHAR LIMIT=50] -->
     <string name="system_speech">Speech</string>
     <!-- Preference which manages TV inputs. [CHAR LIMIT=50] -->
@@ -215,18 +220,16 @@
     <string name="about_preference">About</string>
     <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
     <string name="device_name">Device name</string>
+    <!-- Button to reboot the device [CHAR LIMIT=40] -->
+    <string name="restart_button_label">Restart</string>
     <!-- Preference which shows legal info. [CHAR LIMIT=50] -->
     <string name="about_legal_info">Legal information</string>
     <!-- Preference which shows warranty info. [CHAR LIMIT=50] -->
     <string name="about_warranty">Warranty</string>
     <!-- Preference which shows open source licenses [CHAR LIMIT=50]-->
     <string name="about_legal_license">Open source licenses</string>
-    <!-- Preference which shows additional terms [CHAR LIMIT=50]-->
-    <string name="about_terms_of_service">View Terms of Service</string>
-    <!-- Preference which shows additional terms [CHAR LIMIT=50]-->
-    <string name="about_privacy_policy">View Privacy Policy</string>
-    <!-- Preference which shows additional terms [CHAR LIMIT=50]-->
-    <string name="about_additional_terms">View Additional Terms</string>
+    <!-- Preference which shows terms of service and privacy info [CHAR LIMIT=50]-->
+    <string name="about_terms_of_service">Google legal</string>
     <!-- Toast message displayed if the license data is unavailable [CHAR LIMIT=100] -->
     <string name="about_license_activity_unavailable">License data is unavailable</string>
     <!-- Preference which shows model. [CHAR LIMIT=50] -->
@@ -581,8 +584,6 @@
     <string name="system_time">Time</string>
     <!-- Title for Set Date in System Settings Date Time [CHAR LIMIT=50] -->
     <string name="system_set_date">Set date</string>
-    <!-- Title for Set date format in System Settings Date Time [CHAR LIMIT=50] -->
-    <string name="system_choose_date_format">Choose date format</string>
     <!-- Title for Set Time in System Settings Date Time [CHAR LIMIT=50] -->
     <string name="system_set_time">Set time</string>
     <!-- Title for Set Time Zone in System Settings Date Time [CHAR LIMIT=50] -->
@@ -861,14 +862,6 @@
     <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
     <string name="system_desc_profile_gpu_rendering">Measure rendering time in adb shell dumpsys gfxinfo</string>
 
-    <!-- There is a setting to control the format of dates displayed throughout the system.  This is in the Date & Time Settings screen.  These will be adjusted to use punctuation appropriate to the user's locale. -->
-    <string-array name="date_format_values" translatable="false">
-        <!-- The blank item means to use whatever the locale calls for. -->
-        <item></item>
-        <item>MM-dd-yyyy</item>
-        <item>dd-MM-yyyy</item>
-        <item>yyyy-MM-dd</item>
-    </string-array>
     <!-- The option in the date-format picker for using the normal format
          called for by the user's locale. -->
     <string name="normal_date_format">Regional (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>
diff --git a/Settings/res/values/styles.xml b/Settings/res/values/styles.xml
index 5cc9223..464b6e0 100644
--- a/Settings/res/values/styles.xml
+++ b/Settings/res/values/styles.xml
@@ -69,8 +69,8 @@
     <style name="SetupPane">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:paddingLeft">@dimen/remote_settings_pane_padding</item>
-        <item name="android:paddingRight">@dimen/remote_settings_pane_padding</item>
+        <item name="android:paddingStart">@dimen/remote_settings_pane_padding</item>
+        <item name="android:paddingEnd">@dimen/remote_settings_pane_padding</item>
         <item name="android:gravity">center</item>
         <item name="android:orientation">vertical</item>
     </style>
@@ -102,7 +102,7 @@
     </style>
 
     <style name="SetupText.LeftPane">
-        <item name="android:gravity">right</item>
+        <item name="android:gravity">end</item>
     </style>
 
     <style name="SetupText.LeftPane.Header">
@@ -131,7 +131,7 @@
     </style>
 
     <style name="SetupText.RightPane">
-        <item name="android:gravity">left</item>
+        <item name="android:gravity">start</item>
     </style>
 
     <style name="SetupText.RightPane.List">
@@ -202,10 +202,10 @@
 
     <style name="SettingsText.Header">
         <item name="android:paddingBottom">@dimen/progress_bar_vertical_padding</item>
-        <item name="android:paddingLeft">@dimen/progress_bar_horizontal_padding</item>
-        <item name="android:paddingRight">@dimen/progress_bar_horizontal_padding</item>
+        <item name="android:paddingStart">@dimen/progress_bar_horizontal_padding</item>
+        <item name="android:paddingEnd">@dimen/progress_bar_horizontal_padding</item>
         <item name="android:paddingTop">@dimen/progress_bar_vertical_padding</item>
-        <item name="android:layout_gravity">left|top</item>
+        <item name="android:layout_gravity">start|top</item>
     </style>
 
     <style name="SettingsText.List">
@@ -228,7 +228,7 @@
 
     <style name="SettingsText.List.CenterLeft">
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_alignParentStart">true</item>
     </style>
 
     <style name="SettingsList">
@@ -248,8 +248,8 @@
         <item name="android:layout_width">@dimen/app_icon_size</item>
         <item name="android:layout_height">@dimen/app_icon_size</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginRight">@dimen/app_icon_margin_right</item>
-        <item name="android:layout_marginLeft">@dimen/app_icon_margin_left</item>
+        <item name="android:layout_marginEnd">@dimen/app_icon_margin_end</item>
+        <item name="android:layout_marginStart">@dimen/app_icon_margin_start</item>
     </style>
 
     <style name="SettingsImage.AppIcon.List">
@@ -257,11 +257,11 @@
     </style>
 
     <style name="SettingsImage.AppIcon.Right">
-        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_alignParentEnd">true</item>
     </style>
 
     <style name="SettingsImage.AppIcon.Left">
-        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_alignParentStart">true</item>
     </style>
 
     <style name="ContentFragment">
@@ -311,7 +311,7 @@
 
     <style name="Canvas.Text.Dialog.Content.Description">
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:gravity">right</item>
+        <item name="android:gravity">end</item>
         <item name="android:textColor">@color/content_description_text_color</item>
         <item name="android:textSize">@dimen/content_fragment_description_text_size</item>
         <item name="android:lineSpacingExtra">3dp</item>
diff --git a/Settings/res/xml/main.xml b/Settings/res/xml/main.xml
index 196d4f0..f550eb0 100644
--- a/Settings/res/xml/main.xml
+++ b/Settings/res/xml/main.xml
@@ -27,7 +27,6 @@
     <header
         android:id="@+id/accessories"
         android:title="@string/header_category_accessories" />
-        canvassettings:preference="@xml/accessories" />
     <header
         android:id="@+id/personal"
         android:title="@string/header_category_personal"
diff --git a/Settings/res/xml/restricted_main.xml b/Settings/res/xml/restricted_main.xml
index 12dc99d..a10a5ed 100644
--- a/Settings/res/xml/restricted_main.xml
+++ b/Settings/res/xml/restricted_main.xml
@@ -27,6 +27,5 @@
     <header
         android:id="@+id/accessories"
         android:title="@string/header_category_accessories" />
-        canvassettings:preference="@xml/accessories" />
 
 </preference-headers>
diff --git a/Settings/src/com/android/tv/settings/BrowseInfo.java b/Settings/src/com/android/tv/settings/BrowseInfo.java
index b4f9cf1..8f38f82 100644
--- a/Settings/src/com/android/tv/settings/BrowseInfo.java
+++ b/Settings/src/com/android/tv/settings/BrowseInfo.java
@@ -18,15 +18,23 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.Intent.ShortcutIconResource;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.media.tv.TvInputInfo;
 import android.media.tv.TvInputManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceActivity;
@@ -34,17 +42,19 @@
 import android.support.v17.leanback.widget.HeaderItem;
 import android.support.v17.leanback.widget.ObjectAdapter;
 import android.support.v17.leanback.widget.ListRow;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
 import android.util.Xml;
 
 import com.android.internal.util.XmlUtils;
-
 import com.android.tv.settings.accessories.AccessoryUtils;
 import com.android.tv.settings.accessories.BluetoothAccessoryActivity;
+import com.android.tv.settings.accessories.BluetoothConnectionsManager;
 import com.android.tv.settings.accounts.AccountImageUriGetter;
 import com.android.tv.settings.accounts.AccountSettingsActivity;
+import com.android.tv.settings.accounts.AddAccountWithTypeActivity;
 import com.android.tv.settings.accounts.AuthenticatorHelper;
 import com.android.tv.settings.connectivity.ConnectivityStatusIconUriGetter;
 import com.android.tv.settings.connectivity.ConnectivityStatusTextGetter;
@@ -52,12 +62,13 @@
 import com.android.tv.settings.device.sound.SoundActivity;
 import com.android.tv.settings.users.RestrictedProfileActivity;
 import com.android.tv.settings.util.UriUtils;
+import com.android.tv.settings.util.AccountImageHelper;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
-import java.util.HashSet;
+import java.util.ArrayList;
 import java.util.Set;
 
 /**
@@ -161,7 +172,7 @@
 
     private static final String PREF_KEY_ADD_ACCOUNT = "add_account";
     private static final String PREF_KEY_ADD_ACCESSORY = "add_accessory";
-    private static final String PREF_KEY_WIFI = "wifi";
+    private static final String PREF_KEY_WIFI = "network";
     private static final String PREF_KEY_DEVELOPER = "developer";
     private static final String PREF_KEY_INPUTS = "inputs";
 
@@ -170,9 +181,7 @@
     private int mNextItemId;
     private int mAccountHeaderId;
     private final BluetoothAdapter mBtAdapter;
-    private final Set<BluetoothDevice> mConnectedDevices;
     private final Object mGuard = new Object();
-    private final boolean mAllowMultipleAccounts;
     private MenuItem mWifiItem = null;
     private ArrayObjectAdapter mWifiRow = null;
     private final Handler mHandler = new Handler();
@@ -181,32 +190,18 @@
     private boolean mDeveloperEnabled;
     private boolean mInputSettingNeeded;
 
-    private final Runnable refreshWifiCardRunnable = new Runnable() {
-        public void run() {
-            refreshWifiCard();
-        }
-    };
-
     BrowseInfo(Context context) {
         mContext = context;
         mAuthenticatorHelper = new AuthenticatorHelper();
         mAuthenticatorHelper.updateAuthDescriptions(context);
         mAuthenticatorHelper.onAccountsUpdated(context, null);
         mBtAdapter = BluetoothAdapter.getDefaultAdapter();
-        mConnectedDevices = new HashSet<BluetoothDevice>();
         mNextItemId = 0;
-        mAllowMultipleAccounts =
-                context.getResources().getBoolean(R.bool.multiple_accounts_enabled);
         mPreferenceUtils = new PreferenceUtils(context);
         mDeveloperEnabled = mPreferenceUtils.isDeveloperEnabled();
         mInputSettingNeeded = isInputSettingNeeded();
     }
 
-    @Override
-    public void refreshContent() {
-        init();
-    }
-
     void init() {
         synchronized (mGuard) {
             mHeaderItems.clear();
@@ -242,7 +237,7 @@
             sa = context.getResources().obtainAttributes(attrs, R.styleable.CanvasSettings);
             int preferenceRes = sa.getResourceId(R.styleable.CanvasSettings_preference, 0);
             sa.recycle();
-            mHeaderItems.add(new HeaderItem(headerId, title, null));
+            mHeaderItems.add(new HeaderItem(headerId, title));
             final ArrayObjectAdapter currentRow = new ArrayObjectAdapter();
             mRows.put(headerId, currentRow);
             if (headerId != R.id.accessories) {
@@ -252,10 +247,6 @@
         }
     }
 
-    private boolean canAddAccount() {
-        return !isRestricted();
-    }
-
     private boolean isRestricted() {
         return RestrictedProfileActivity.isRestrictedProfileInEffect(mContext);
     }
@@ -310,15 +301,6 @@
         }
     }
 
-    private void refreshWifiCard() {
-        if (mWifiItem != null) {
-            int index = mWifiRow.indexOf(mWifiItem);
-            if (index >= 0) {
-                mWifiRow.notifyArrayItemRangeChanged(index, 1);
-            }
-        }
-    }
-
     void rebuildInfo() {
         init();
     }
@@ -362,25 +344,16 @@
         }
     }
 
-    public void updateWifi() {
-        mHandler.post(refreshWifiCardRunnable);
-    }
-
-    void bluetoothDeviceConnected(BluetoothDevice device) {
-        synchronized (mConnectedDevices) {
-            mConnectedDevices.add(device);
-        }
-    }
-
-    void bluetoothDeviceDisconnected(BluetoothDevice device) {
-        synchronized (mConnectedDevices) {
-            mConnectedDevices.remove(device);
-        }
-    }
-
-    boolean isDeviceConnected(BluetoothDevice device) {
-        synchronized (mConnectedDevices) {
-            return mConnectedDevices.contains(device);
+    public void updateWifi(final boolean isEthernetAvailable) {
+        if (mWifiItem != null) {
+            int index = mWifiRow.indexOf(mWifiItem);
+            if (index >= 0) {
+                mWifiItem = new MenuItem.Builder().from(mWifiItem)
+                        .title(mContext.getString(isEthernetAvailable
+                                    ? R.string.connectivity_network : R.string.connectivity_wifi))
+                        .build();
+                mWifiRow.replace(index, mWifiItem);
+            }
         }
     }
 
@@ -478,48 +451,85 @@
     }
 
     private void addAccounts(ArrayObjectAdapter row) {
-        String[] accountTypes = mAuthenticatorHelper.getEnabledAccountTypes();
-        if (accountTypes.length == 0) {
-            // That's weird, let's try updating.
-            mAuthenticatorHelper.onAccountsUpdated(mContext, null);
-            accountTypes = mAuthenticatorHelper.getEnabledAccountTypes();
-        }
+        AccountManager am = AccountManager.get(mContext);
+        AuthenticatorDescription[] authTypes = am.getAuthenticatorTypes();
+        ArrayList<String> allowableAccountTypes = new ArrayList<>(authTypes.length);
+        PackageManager pm = mContext.getPackageManager();
 
         int googleAccountCount = 0;
 
-        for (String accountType : accountTypes) {
-            CharSequence label = mAuthenticatorHelper.getLabelForType(mContext, accountType);
-            if (label == null) {
+        for (AuthenticatorDescription authDesc : authTypes) {
+            Resources resources = null;
+            try {
+                resources = pm.getResourcesForApplication(authDesc.packageName);
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Authenticator description with bad package name", e);
                 continue;
             }
 
-            Account[] accounts = AccountManager.get(mContext).getAccountsByType(accountType);
-            if (ACCOUNT_TYPE_GOOGLE.equals(accountType)) {
-                googleAccountCount = accounts.length;
+            allowableAccountTypes.add(authDesc.type);
+
+            // Main title text comes from the authenticator description (e.g. "Google").
+            String authTitle = null;
+            try {
+                authTitle = resources.getString(authDesc.labelId);
+                if (TextUtils.isEmpty(authTitle)) {
+                    authTitle = null;  // Handled later when we add the row.
+                }
+            } catch (NotFoundException e) {
+                Log.e(TAG, "Authenticator description with bad label id", e);
             }
+
+            Account[] accounts = am.getAccountsByType(authDesc.type);
+
+            // Icon URI to be displayed for each account is based on the type of authenticator.
+            String imageUri = null;
+            if (ACCOUNT_TYPE_GOOGLE.equals(authDesc.type)) {
+                googleAccountCount = accounts.length;
+                imageUri = googleAccountIconUri(mContext);
+            } else {
+                imageUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
+                        authDesc.packageName + '/' +
+                        resources.getResourceTypeName(authDesc.iconId) + '/' +
+                        resources.getResourceEntryName(authDesc.iconId))
+                        .toString();
+            }
+
+            // Display an entry for each installed account we have.
             for (final Account account : accounts) {
                 Intent i = new Intent(mContext, AccountSettingsActivity.class)
                         .putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, account.name);
                 i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-                row.add(new MenuItem.Builder().id(mNextItemId++).title(account.name)
-                        .imageUriGetter(new AccountImageUriGetter(mContext, account))
+                row.add(new MenuItem.Builder().id(mNextItemId++)
+                        .title(authTitle != null ? authTitle : account.name)
+                        .imageUri(imageUri)
+                        .description(authTitle != null ? account.name : null)
                         .intent(i)
                         .build());
             }
         }
 
-        if (canAddAccount() && (mAllowMultipleAccounts || googleAccountCount == 0)) {
-            ComponentName componentName = new ComponentName("com.android.tv.settings",
-                    "com.android.tv.settings.accounts.AddAccountWithTypeActivity");
-            Intent i = new Intent().setComponent(componentName);
-            i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-            if (accountTypes.length == 1) {
-                i.putExtra(AccountManager.KEY_ACCOUNT_TYPE, accountTypes[0]);
+        // Never allow restricted profile to add accounts.
+        if (!isRestricted()) {
+
+            // If there's already a Google account installed, disallow installing a second one.
+            if (googleAccountCount > 0) {
+                allowableAccountTypes.remove(ACCOUNT_TYPE_GOOGLE);
             }
-            row.add(new MenuItem.Builder().id(mNextItemId++)
-                    .title(mContext.getString(R.string.add_account))
-                    .imageResourceId(mContext, R.drawable.ic_settings_add)
-                    .intent(i).build());
+
+            // If there are available account types, add the "add account" button.
+            if (!allowableAccountTypes.isEmpty()) {
+                Intent i = new Intent().setComponent(new ComponentName("com.android.tv.settings",
+                        "com.android.tv.settings.accounts.AddAccountWithTypeActivity"));
+                i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+                i.putExtra(AddAccountWithTypeActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY,
+                        allowableAccountTypes.toArray(new String[allowableAccountTypes.size()]));
+
+                row.add(new MenuItem.Builder().id(mNextItemId++)
+                        .title(mContext.getString(R.string.add_account))
+                        .imageResourceId(mContext, R.drawable.ic_settings_add)
+                        .intent(i).build());
+            }
         }
     }
 
@@ -530,6 +540,9 @@
                 Log.d(TAG, "List of Bonded BT Devices:");
             }
 
+            Set<String> connectedBluetoothAddresses =
+                    BluetoothConnectionsManager.getConnectedSet(mContext);
+
             for (BluetoothDevice device : bondedDevices) {
                 if (DEBUG) {
                     Log.d(TAG, "   Device name: " + device.getName() + " , Class: " +
@@ -541,8 +554,8 @@
                         device.getName(), resourceId);
                 i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
 
-                String desc = isDeviceConnected(device) ? mContext.getString(
-                        R.string.accessory_connected)
+                String desc = connectedBluetoothAddresses.contains(device.getAddress())
+                        ? mContext.getString(R.string.accessory_connected)
                         : null;
 
                 row.add(new MenuItem.Builder().id(mNextItemId++).title(device.getName())
@@ -551,4 +564,12 @@
             }
         }
     }
+
+    private static String googleAccountIconUri(Context context) {
+        ShortcutIconResource iconResource = new ShortcutIconResource();
+        iconResource.packageName = context.getPackageName();
+        iconResource.resourceName = context.getResources().getResourceName(
+                R.drawable.ic_settings_google_account);
+        return UriUtils.getShortcutIconResourceUri(iconResource).toString();
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/BrowseInfoFactory.java b/Settings/src/com/android/tv/settings/BrowseInfoFactory.java
index bacfdca..61420d2 100644
--- a/Settings/src/com/android/tv/settings/BrowseInfoFactory.java
+++ b/Settings/src/com/android/tv/settings/BrowseInfoFactory.java
@@ -20,5 +20,4 @@
 
 public interface BrowseInfoFactory {
     ObjectAdapter getRows();
-    void refreshContent();
 }
diff --git a/Settings/src/com/android/tv/settings/MainSettings.java b/Settings/src/com/android/tv/settings/MainSettings.java
index 955b6db..afe1c12 100644
--- a/Settings/src/com/android/tv/settings/MainSettings.java
+++ b/Settings/src/com/android/tv/settings/MainSettings.java
@@ -28,6 +28,7 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 
+import com.android.tv.settings.accessories.BluetoothConnectionsManager;
 import com.android.tv.settings.connectivity.ConnectivityListener;
 
 import java.util.Locale;
@@ -38,26 +39,16 @@
 public class MainSettings extends MenuActivity implements OnAccountsUpdateListener,
         ConnectivityListener.Listener {
 
+    private static MainSettings sInstance;
+
     private BrowseInfo mBrowseInfo;
     private AccountManager mAccountManager;
     private Locale mCurrentLocale;
-    private IntentFilter mAdapterIntentFilter;
     private ConnectivityListener mConnectivityListener;
 
-    // Broadcast Receiver for Bluetooth related events
-    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            if (action == BluetoothDevice.ACTION_ACL_CONNECTED) {
-                mBrowseInfo.bluetoothDeviceConnected(device);
-            } else if (action == BluetoothDevice.ACTION_ACL_DISCONNECTED) {
-                mBrowseInfo.bluetoothDeviceDisconnected(device);
-            }
-            mBrowseInfo.updateAccessories();
-        }
-    };
+    public static synchronized MainSettings getInstance() {
+        return sInstance;
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,14 +56,7 @@
         mBrowseInfo.init();
         mCurrentLocale = Locale.getDefault();
         mAccountManager = AccountManager.get(this);
-        mAdapterIntentFilter = new IntentFilter();
 
-        mAdapterIntentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        mAdapterIntentFilter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
-        mAdapterIntentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
-        mAdapterIntentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
-
-        registerReceiver(mBroadcastReceiver, mAdapterIntentFilter);
         super.onCreate(savedInstanceState);
 
         mConnectivityListener = new ConnectivityListener(this, this);
@@ -90,7 +74,19 @@
     @Override
     protected void onResume() {
         super.onResume();
+        sInstance = this;
+        updateAccessories();
         mBrowseInfo.checkForDeveloperOptionUpdate();
+
+        // Update network item forcefully here
+        // because mBrowseInfo doesn't have information regarding Ethernet availability.
+        mBrowseInfo.updateWifi(mConnectivityListener.isEthernetAvailable());
+    }
+
+    @Override
+    protected void onPause() {
+        sInstance = null;
+        super.onPause();
     }
 
     @Override
@@ -103,13 +99,12 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        unregisterReceiver(mBroadcastReceiver);
         mAccountManager.removeOnAccountsUpdatedListener(this);
     }
 
     @Override
     public void onConnectivityChange(Intent intent) {
-        mBrowseInfo.updateWifi();
+        mBrowseInfo.updateWifi(mConnectivityListener.isEthernetAvailable());
     }
 
     @Override
@@ -137,4 +132,8 @@
     public void onAccountsUpdated(Account[] accounts) {
         mBrowseInfo.updateAccounts();
     }
+
+    public void updateAccessories() {
+        mBrowseInfo.updateAccessories();
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/MenuItem.java b/Settings/src/com/android/tv/settings/MenuItem.java
index 5fedcd7..7d86707 100644
--- a/Settings/src/com/android/tv/settings/MenuItem.java
+++ b/Settings/src/com/android/tv/settings/MenuItem.java
@@ -41,6 +41,15 @@
         private UriGetter mImageUriGetter;
         private Intent mIntent;
 
+        public Builder from(MenuItem item) {
+            mId = item.mId;
+            mTitle = item.mDisplayName;
+            mDescriptionGetter = item.mDisplayDescriptionTextGetter;
+            mImageUriGetter = item.mImageUriGetter;
+            mIntent = item.mIntent;
+            return this;
+        }
+
         public Builder id(int id) {
             mId = id;
             return this;
@@ -129,7 +138,7 @@
         mIntent = intent;
     }
 
-    public long getId() {
+    public int getId() {
         return mId;
     }
 
diff --git a/Settings/src/com/android/tv/settings/about/AboutActivity.java b/Settings/src/com/android/tv/settings/about/AboutActivity.java
index c01e33f..4dfcec6 100644
--- a/Settings/src/com/android/tv/settings/about/AboutActivity.java
+++ b/Settings/src/com/android/tv/settings/about/AboutActivity.java
@@ -17,28 +17,29 @@
 package com.android.tv.settings.about;
 
 import com.android.tv.settings.R;
-
 import com.android.tv.settings.PreferenceUtils;
-
 import com.android.tv.settings.dialog.old.Action;
 import com.android.tv.settings.dialog.old.ActionAdapter;
 import com.android.tv.settings.dialog.old.ActionFragment;
 import com.android.tv.settings.dialog.old.ContentFragment;
 import com.android.tv.settings.dialog.old.DialogActivity;
-import com.android.tv.settings.dialog.old.TosWebViewFragment;
-
 import com.android.tv.settings.name.DeviceManager;
 
 import android.app.Fragment;
 import android.app.FragmentTransaction;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.PowerManager;
 import android.os.SystemClock;
 import android.text.TextUtils;
+import android.util.Log;
 import android.widget.Toast;
 
 import java.util.ArrayList;
@@ -50,37 +51,35 @@
 public class AboutActivity extends DialogActivity implements ActionAdapter.Listener,
         ActionAdapter.OnFocusListener {
 
+    private static final String TAG = "AboutActivity";
+
     /**
-     * Action key for legal actions container.
+     * Action keys for switching over in onActionClicked.
      */
     private static final String KEY_LEGAL_INFO = "about_legal_info";
-
-    /**
-     * Action key for legal open source license action.
-     */
-    private static final String KEY_LEGAL_INFO_OPEN_SOURCE_LICENSES =
-            "about_legal_info_open_source_licenses";
-
-    /**
-     * Action keys for legal terms.
-     */
-    private static final String TERMS_OF_SERVICE = "terms_of_service";
-    private static final String PRIVACY_POLICY = "privacy_policy";
-    private static final String ADDITIONAL_TERMS = "additional_terms";
-
     private static final String KEY_BUILD = "build";
     private static final String KEY_VERSION = "version";
+    private static final String KEY_REBOOT = "reboot";
 
     /**
-     * Intent action of SettingsLicenseActivity.
+     * Intent action of SettingsLicenseActivity (for displaying open source licenses.)
      */
     private static final String SETTINGS_LEGAL_LICENSE_INTENT_ACTION = "android.settings.LICENSE";
 
     /**
+     * Intent action of SettingsTosActivity (for displaying terms of service.)
+     */
+    private static final String SETTINGS_LEGAL_TERMS_OF_SERVICE = "android.settings.TERMS";
+
+    /**
      * Intent action of device name activity.
      */
-    private static final String SETTINGS_DEVICE_NAME_INTENT_ACTION =
-        "android.settings.DEVICE_NAME";
+    private static final String SETTINGS_DEVICE_NAME_INTENT_ACTION = "android.settings.DEVICE_NAME";
+
+    /**
+     * Intent action of system update activity.
+     */
+    private static final String SETTINGS_UPDATE_SYSTEM = "android.settings.SYSTEM_UPDATE_SETTINGS";
 
     /**
      * Intent to launch ads activity.
@@ -122,7 +121,6 @@
     public void onResume() {
         super.onResume();
         mDeveloperClickCount = 0;
-        setActionFragment(ActionFragment.newInstance(getActions(), mSelectedIndex), false);
     }
 
     @Override
@@ -159,51 +157,39 @@
                 intent.setComponent(mPlatLogoActivity);
                 startActivity(intent);
             }
-        } else if (TextUtils.equals(key, TERMS_OF_SERVICE)) {
-            displayFragment(TosWebViewFragment.
-                newInstance(TosWebViewFragment.SHOW_TERMS_OF_SERVICE));
-        } else if (TextUtils.equals(key, PRIVACY_POLICY)) {
-            displayFragment(TosWebViewFragment.newInstance(TosWebViewFragment.SHOW_PRIVACY_POLICY));
-        } else if (TextUtils.equals(key, ADDITIONAL_TERMS)) {
-            displayFragment(
-                TosWebViewFragment.newInstance (TosWebViewFragment.SHOW_ADDITIONAL_TERMS));
         } else if (TextUtils.equals(key, KEY_LEGAL_INFO)) {
             ArrayList<Action> actions = getLegalActions();
             setContentAndActionFragments(ContentFragment.newInstance(
                     getString(R.string.about_legal_info), null, null),
                     ActionFragment.newInstance(actions));
+        } else if (TextUtils.equals(key, KEY_REBOOT)) {
+            PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
+            pm.reboot(null);
         } else {
             Intent intent = action.getIntent();
             if (intent != null) {
-                startActivity(intent);
+                try {
+                    startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    Log.e(TAG, "intent for (" + action.getTitle() + ") not found:", e);
+                }
+            } else {
+                Log.e(TAG, "null intent for: " + action.getTitle());
             }
         }
     }
 
     private ArrayList<Action> getLegalActions() {
         ArrayList<Action> actions = new ArrayList<Action>();
-        Intent licensesIntent = new Intent(SETTINGS_LEGAL_LICENSE_INTENT_ACTION);
         actions.add(new Action.Builder()
-                .key(KEY_LEGAL_INFO_OPEN_SOURCE_LICENSES)
-                .intent(licensesIntent)
+                .intent(systemIntent(SETTINGS_LEGAL_LICENSE_INTENT_ACTION))
                 .title(getString(R.string.about_legal_license))
                 .build());
-
         actions.add(new Action.Builder()
-                .key(TERMS_OF_SERVICE)
+                .intent(systemIntent(SETTINGS_LEGAL_TERMS_OF_SERVICE))
                 .title(getString(R.string.about_terms_of_service))
                 .build());
 
-        actions.add(new Action.Builder()
-                .key(PRIVACY_POLICY)
-                .title(getString(R.string.about_privacy_policy))
-                .build());
-
-        actions.add(new Action.Builder()
-                .key(ADDITIONAL_TERMS)
-                .title(getString(R.string.about_additional_terms))
-                .build());
-
         return actions;
     }
 
@@ -212,7 +198,7 @@
         actions.add(new Action.Builder()
                 .key("update")
                 .title(getString(R.string.about_system_update))
-                .intent(new Intent("android.settings.SYSTEM_UPDATE_SETTINGS"))
+                .intent(systemIntent(SETTINGS_UPDATE_SYSTEM))
                 .build());
         actions.add(new Action.Builder()
                 .key("name")
@@ -221,6 +207,10 @@
                 .intent(new Intent(SETTINGS_DEVICE_NAME_INTENT_ACTION))
                 .build());
         actions.add(new Action.Builder()
+                .key(KEY_REBOOT)
+                .title(getString(R.string.restart_button_label))
+                .build());
+        actions.add(new Action.Builder()
                 .key(KEY_LEGAL_INFO)
                 .title(getString(R.string.about_legal_info))
                 .build());
@@ -279,7 +269,25 @@
         if (mToast != null) {
             mToast.cancel();
         }
-        mToast = Toast.makeText(this,  toastString, Toast.LENGTH_SHORT);
+        mToast = Toast.makeText(this, toastString, Toast.LENGTH_SHORT);
         mToast.show();
     }
+
+    // Returns an Intent for the given action if a system app can handle it, otherwise null.
+    private Intent systemIntent(String action) {
+        final Intent intent = new Intent(action);
+
+        // Limit the intent to an activity that is in the system image.
+        final PackageManager pm = getPackageManager();
+        final List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo info : activities) {
+            if ((info.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                if (info.activityInfo.isEnabled()) {
+                    intent.setPackage(info.activityInfo.packageName);
+                    return intent;
+                }
+            }
+        }
+        return null;  // No system image package found.
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/about/LicenseActivity.java b/Settings/src/com/android/tv/settings/about/LicenseActivity.java
index c32e326..a1efa18 100644
--- a/Settings/src/com/android/tv/settings/about/LicenseActivity.java
+++ b/Settings/src/com/android/tv/settings/about/LicenseActivity.java
@@ -19,21 +19,17 @@
 import com.android.tv.settings.R;
 
 import android.app.Activity;
-import android.os.AsyncTask;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
-import android.webkit.WebView;
 import android.widget.Toast;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
+import java.io.File;
+
 
 /**
  * Displays open source NOTICE files.
@@ -41,94 +37,44 @@
 public class LicenseActivity extends Activity {
 
     private static final String TAG = "LicenseActivity";
-    private static final boolean LOGV = false;
 
     private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
     private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
 
-    private WebView mWebView;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.license_activity);
-        mWebView = (WebView) findViewById(R.id.license);
 
-        String fileName = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
-        if (TextUtils.isEmpty(fileName)) {
-            Log.e(TAG, "The system property for the license file is empty.");
+        final String path = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
+        if (TextUtils.isEmpty(path)) {
+            Log.e(TAG, "The system property for the license file is empty");
             showErrorAndFinish();
             return;
         }
 
-        new LicenseFileLoader().execute(fileName);
-    }
-
-    private class LicenseFileLoader extends AsyncTask<String, Void, String> {
-
-        public static final int STATUS_OK = 0;
-        public static final int STATUS_NOT_FOUND = 1;
-        public static final int STATUS_READ_ERROR = 2;
-        public static final int STATUS_EMPTY_FILE = 3;
-
-        @Override
-        protected void onPreExecute() {
-            // TODO: implement loading text or graphic here.
-            mWebView.setVisibility(View.GONE);
+        final File file = new File(path);
+        if (!file.exists() || file.length() == 0) {
+            Log.e(TAG, "License file " + path + " does not exist");
+            showErrorAndFinish();
+            return;
         }
 
-        @Override
-        protected String doInBackground(String... params) {
-            int status = STATUS_OK;
-            String fileName = params[0];
+        // Kick off external viewer due to WebView security restrictions; we
+        // carefully point it at HTMLViewer, since it offers to decompress
+        // before viewing.
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.fromFile(file), "text/html");
+        intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.about_legal_license));
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage("com.android.htmlviewer");
 
-            InputStreamReader inputReader = null;
-            StringBuilder data = new StringBuilder(2048);
-            try {
-                char[] tmp = new char[2048];
-                int numRead;
-                if (fileName.endsWith(".gz")) {
-                    inputReader = new InputStreamReader(
-                        new GZIPInputStream(new FileInputStream(fileName)));
-                } else {
-                    inputReader = new FileReader(fileName);
-                }
-
-                while ((numRead = inputReader.read(tmp)) >= 0) {
-                    data.append(tmp, 0, numRead);
-                }
-            } catch (FileNotFoundException e) {
-                Log.e(TAG, "License HTML file not found at " + fileName, e);
-                status = STATUS_NOT_FOUND;
-            } catch (IOException e) {
-                Log.e(TAG, "Error reading license HTML file at " + fileName, e);
-                status = STATUS_READ_ERROR;
-            } finally {
-                try {
-                    if (inputReader != null) {
-                        inputReader.close();
-                    }
-                } catch (IOException e) {
-                }
-            }
-
-            if ((status == STATUS_OK) && TextUtils.isEmpty(data)) {
-                Log.e(TAG, "License HTML is empty (from " + fileName + ")");
-                status = STATUS_EMPTY_FILE;
-            }
-            return data.toString();
+        try {
+            startActivity(intent);
+            finish();
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "Failed to find viewer", e);
+            showErrorAndFinish();
         }
-
-        @Override
-        protected void onPostExecute(String result) {
-            showDataInPage(result);
-        }
-    }
-
-    private void showDataInPage(String data) {
-        // TODO: implement hiding loading text or graphic here.
-        mWebView.setVisibility(View.VISIBLE);
-        mWebView.loadDataWithBaseURL(null, data, "text/html", "utf-8", null);
     }
 
     private void showErrorAndFinish() {
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
index 1fd8096..f719a7f 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
@@ -36,6 +36,7 @@
 import android.os.SystemClock;
 import android.service.dreams.DreamService;
 import android.service.dreams.IDreamManager;
+import android.support.v4.view.ViewCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -89,6 +90,7 @@
     private static final int KEY_DOWN_TIME = 150;
     private static final int TIME_TO_START_AUTOPAIR_COUNT = 5000;
     private static final int BLINK_START = 1000;
+    private static final int EXIT_TIMEOUT_MILLIS = 90 * 1000;
 
     private ActionFragment mActionFragment;
     private ArrayList<Action> mActions;
@@ -201,6 +203,15 @@
         }
     };
 
+    private final Handler mAutoExitHandler = new Handler();
+
+    private final Runnable mAutoExitRunnable = new Runnable() {
+        @Override
+        public void run() {
+            stopActivity();
+        }
+    };
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setLayoutProperties(R.layout.add_accessory_custom_two_pane_dialog, R.id.content_fragment,
@@ -267,8 +278,10 @@
                                 mContentView = findViewById(R.id.content_fragment);
                                 if (mActionView != null) {
                                     mViewOffset = mActionView.getMeasuredWidth();
-                                    mActionView.setTranslationX(mViewOffset);
-                                    mContentView.setTranslationX(mViewOffset / 2);
+                                    int offset = (ViewCompat.getLayoutDirection(mActionView) ==
+                                            View.LAYOUT_DIRECTION_RTL) ? -mViewOffset : mViewOffset;
+                                    mActionView.setTranslationX(offset);
+                                    mContentView.setTranslationX(offset / 2);
                                 }
                                 mAutoPairText = (TextView) findViewById(R.id.autopair_message);
                                 if (mAutoPairText != null) {
@@ -288,6 +301,23 @@
     }
 
     @Override
+    public void onPause() {
+        super.onPause();
+        if (DEBUG) Log.d(TAG, "stopping auto-exit timer");
+        mAutoExitHandler.removeCallbacks(mAutoExitRunnable);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mNoInputMode) {
+            // Start timer count down for exiting activity.
+            if (DEBUG) Log.d(TAG, "starting auto-exit timer");
+            mAutoExitHandler.postDelayed(mAutoExitRunnable, EXIT_TIMEOUT_MILLIS);
+        }
+    }
+
+    @Override
     public void onStop() {
         if (DEBUG) {
             Log.d(TAG, "onStop()");
@@ -304,7 +334,6 @@
     }
 
     @Override
-
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_HOME) {
             if (mPairingBluetooth && !mDone) {
@@ -460,19 +489,28 @@
             }
 
             if (mNoInputMode) {
+                if (DEBUG) Log.d(TAG, "stopping auto-exit timer");
+                mAutoExitHandler.removeCallbacks(mAutoExitRunnable);
                 if (mActions.size() == 1 && prevNumDevices == 0) {
                     // first device added, start counter for autopair
                     mMsgHandler.sendEmptyMessageDelayed(MSG_START_AUTOPAIR_COUNTDOWN,
                             TIME_TO_START_AUTOPAIR_COUNT);
-                } else if (mActions.size() > 1) {
-                    // More than one device found, cancel auto pair
-                    cancelPairingCountdown();
+                } else {
 
-                    if (!mShowingMultiFragment && !mFragmentTransactionPending) {
-                        if (mActionsAnimationDone) {
-                            switchToMultipleDevicesFragment();
-                        } else {
-                            mFragmentTransactionPending = true;
+                    // Start timer count down for exiting activity.
+                    if (DEBUG) Log.d(TAG, "starting auto-exit timer");
+                    mAutoExitHandler.postDelayed(mAutoExitRunnable, EXIT_TIMEOUT_MILLIS);
+
+                    if (mActions.size() > 1) {
+                        // More than one device found, cancel auto pair
+                        cancelPairingCountdown();
+
+                        if (!mShowingMultiFragment && !mFragmentTransactionPending) {
+                            if (mActionsAnimationDone) {
+                                switchToMultipleDevicesFragment();
+                            } else {
+                                mFragmentTransactionPending = true;
+                            }
                         }
                     }
                }
@@ -631,7 +669,7 @@
                 String state = "?";
                 switch (status) {
                     case InputPairer.STATUS_NONE:
-                        state = "InputPairer.STATUS_NONEi";
+                        state = "InputPairer.STATUS_NONE";
                         break;
                     case InputPairer.STATUS_SCANNING:
                         state = "InputPairer.STATUS_SCANNING";
@@ -715,6 +753,9 @@
                 case InputPairer.STATUS_ERROR:
                     mPairingSuccess = false;
                     setPairingBluetooth(false);
+                    if (mNoInputMode) {
+                        clearDeviceList();
+                    }
                     break;
             }
 
@@ -724,6 +765,11 @@
         }
     }
 
+    private void clearDeviceList() {
+        mBtDevices.clear();
+        mBtPairer.clearDeviceList();
+    }
+
     private void stopActivity() {
         stopBluetoothPairer();
         mMsgHandler.removeCallbacksAndMessages(null);
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothConnectionsManager.java b/Settings/src/com/android/tv/settings/accessories/BluetoothConnectionsManager.java
new file mode 100644
index 0000000..aa6d46f
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothConnectionsManager.java
@@ -0,0 +1,92 @@
+package com.android.tv.settings.accessories;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.SystemClock;
+import android.text.TextUtils;
+
+import com.android.tv.settings.MainSettings;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class BluetoothConnectionsManager extends BroadcastReceiver {
+    private static final String PREFS_NAME = "bt-connected-devs";
+    private static final String KEY_CONNECTED_SET = "conencted-set";
+    private static final String KEY_BT_STATE = "bt-state";
+
+    public void onReceive(Context context, Intent intent) {
+        onConnectionChanged(context, intent);
+    }
+
+    public static void onConnectionChanged(Context context, Intent intent) {
+        final String action = intent.getAction();
+
+        final SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        Set<String> connected = prefs.getStringSet(KEY_CONNECTED_SET, new HashSet<String>());
+        int btState = prefs.getInt(KEY_BT_STATE, BluetoothAdapter.STATE_OFF);
+
+        boolean listChanged = false;
+        boolean btStateChanged = false;
+
+        if (TextUtils.equals(action, BluetoothAdapter.ACTION_STATE_CHANGED)) {
+            final int newBtState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
+                    BluetoothAdapter.ERROR);
+
+            if (btState != newBtState) {
+                // if BT was just turned off, we can't be connected to any devices.
+                // if BT was just turned on, we haven't had the time to connect to any devices yet.
+                if (newBtState == BluetoothAdapter.STATE_ON ||
+                        newBtState == BluetoothAdapter.STATE_OFF) {
+                    listChanged = true;
+                    connected.clear();
+                }
+
+                btStateChanged = true;
+                btState = newBtState;
+            }
+        } else if (intent.getExtras() != null) {
+            BluetoothDevice device = intent.getExtras().getParcelable(BluetoothDevice.EXTRA_DEVICE);
+            if (device != null) {
+                if (TextUtils.equals(action, BluetoothDevice.ACTION_ACL_CONNECTED)) {
+                    listChanged = connected.add(device.getAddress());
+                } else if (TextUtils.equals(action, BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
+                    listChanged = connected.remove(device.getAddress());
+                }
+            }
+        }
+
+        if (btStateChanged || listChanged) {
+            SharedPreferences.Editor editor = prefs.edit();
+
+            if (btStateChanged) {
+                editor.putInt(KEY_BT_STATE, btState);
+            }
+            if (listChanged) {
+                editor.putStringSet(KEY_CONNECTED_SET, connected);
+            }
+
+            editor.apply();
+        }
+
+        if (listChanged) {
+            MainSettings settings = MainSettings.getInstance();
+            if (settings != null) {
+                settings.updateAccessories();
+            }
+        }
+    }
+
+    public static boolean isConnected(Context context, String address) {
+        return getConnectedSet(context).contains(address);
+    }
+
+    public static Set<String> getConnectedSet(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        return prefs.getStringSet(KEY_CONNECTED_SET, new HashSet<String>());
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/accessories/InputPairer.java b/Settings/src/com/android/tv/settings/accessories/InputPairer.java
index bb6b357..e5da259 100644
--- a/Settings/src/com/android/tv/settings/accessories/InputPairer.java
+++ b/Settings/src/com/android/tv/settings/accessories/InputPairer.java
@@ -352,6 +352,11 @@
         BluetoothScanner.startListening(mContext, mBtListener, new InputDeviceCriteria());
     }
 
+    public void clearDeviceList() {
+        doCancel();
+        mVisibleDevices.clear();
+    }
+
     /**
      * Stop any pairing request that is in progress.
      */
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsBrowseInfo.java b/Settings/src/com/android/tv/settings/accounts/AccountsBrowseInfo.java
index 38a49f0..6817b79 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountsBrowseInfo.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountsBrowseInfo.java
@@ -64,13 +64,8 @@
         updateMenuItems(mAccountName);
     }
 
-    @Override
-    public void refreshContent() {
-        loadCacheItems();
-    }
-
     private void addBrowseHeader(int id, String title) {
-        mHeaderItems.add(new HeaderItem(id, title, null));
+        mHeaderItems.add(new HeaderItem(id, title));
     }
 
     private void updateMenuItems(String accountName) {
diff --git a/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java b/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
index 0f0b09f..737175f 100644
--- a/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
+++ b/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
@@ -27,8 +27,12 @@
 import java.io.IOException;
 import android.util.Log;
 
+
 public class AddAccountWithTypeActivity extends Activity {
 
+    // Must match com.google.android.gms.common.AccountPicker.
+    public static final String EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY = "allowableAccountTypes";
+
     private static final String TAG = "AddAccountWithTypeActivity";
 
     private static final int REQUEST_CHOOSE_ACCOUNT_TYPE = 0;
@@ -36,8 +40,6 @@
     private static final String CHOOSE_ACCOUNT_TYPE_ACTION =
             "com.google.android.gms.common.account.CHOOSE_ACCOUNT_TYPE";
 
-    private boolean mLaunchAccountTypePicker;
-
     private final AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
         @Override
         public void run(AccountManagerFuture<Bundle> future) {
@@ -46,19 +48,19 @@
                         .getParcelable(AccountManager.KEY_INTENT);
                 if (addAccountIntent == null) {
                     Log.e(TAG, "Failed to retrieve add account intent from authenticator");
-                    handleAddAccountError();
+                    setResultAndFinish(Activity.RESULT_CANCELED);
                 } else {
                     startActivityForResult(addAccountIntent, REQUEST_ADD_ACCOUNT);
                 }
             } catch (OperationCanceledException e) {
                 Log.e(TAG, "Failed to get add account intent: " + e);
-                handleAddAccountError();
+                setResultAndFinish(Activity.RESULT_CANCELED);
             } catch (IOException e) {
                 Log.e(TAG, "Failed to get add account intent: " + e);
-                handleAddAccountError();
+                setResultAndFinish(Activity.RESULT_CANCELED);
             } catch (AuthenticatorException e) {
                 Log.e(TAG, "Failed to get add account intent: " + e);
-                handleAddAccountError();
+                setResultAndFinish(Activity.RESULT_CANCELED);
             }
         }
     };
@@ -70,48 +72,30 @@
         if (accountType != null) {
             startAddAccount(accountType);
         } else {
-            startAccountTypePicker();
+            String[] allowedTypes = getIntent().getStringArrayExtra(
+                    EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY);
+            startAccountTypePicker(allowedTypes);
         }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (Activity.RESULT_CANCELED == resultCode) {
-            setResult(resultCode);
-            finish();
-            return;
-        }
-
-        switch (requestCode) {
-            case REQUEST_ADD_ACCOUNT:
-                if (resultCode == Activity.RESULT_OK) {
-                    setResult(resultCode);
-                    finish();
-                } else {
-                    handleAddAccountError(resultCode);
-                }
-                break;
-            case REQUEST_CHOOSE_ACCOUNT_TYPE:
-                if (resultCode == Activity.RESULT_OK) {
-                    String accountType = data.getExtras()
-                            .getString(AccountManager.KEY_ACCOUNT_TYPE);
-                    startAddAccount(accountType);
-                } else {
-                    setResult(resultCode);
-                    finish();
-                }
-                break;
+        // User selected an account type, so kick off the add account flow for that.
+        if (requestCode == REQUEST_CHOOSE_ACCOUNT_TYPE && resultCode == Activity.RESULT_OK) {
+            String accountType = data.getExtras().getString(AccountManager.KEY_ACCOUNT_TYPE);
+            startAddAccount(accountType);
+        } else {
+            setResultAndFinish(resultCode);
         }
     }
 
-    private void startAccountTypePicker() {
-        mLaunchAccountTypePicker = true;
+    private void startAccountTypePicker(String[] allowedTypes) {
         Intent i = new Intent(CHOOSE_ACCOUNT_TYPE_ACTION);
+        i.putExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY, allowedTypes);
         startActivityForResult(i, REQUEST_CHOOSE_ACCOUNT_TYPE);
     }
 
     private void startAddAccount(String accountType) {
-        mLaunchAccountTypePicker = false;
         AccountManager.get(this).addAccount(
                 accountType,
                 null, /* authTokenType */
@@ -120,18 +104,8 @@
                 null, mCallback, null);
     }
 
-    private void handleAddAccountError() {
-        handleAddAccountError(Activity.RESULT_CANCELED);
-    }
-
-    private void handleAddAccountError(int resultCode) {
-        if (mLaunchAccountTypePicker) {
-            Log.e(TAG, "request add account failed to add account");
-            // try again
-            startAccountTypePicker();
-        } else {
-            setResult(resultCode);
-            finish();
-        }
+    private void setResultAndFinish(int resultCode) {
+        setResult(resultCode);
+        finish();
     }
 }
diff --git a/Settings/src/com/android/tv/settings/connectivity/AdvancedWifiOptionsFlow.java b/Settings/src/com/android/tv/settings/connectivity/AdvancedWifiOptionsFlow.java
index 36172af..a869656 100644
--- a/Settings/src/com/android/tv/settings/connectivity/AdvancedWifiOptionsFlow.java
+++ b/Settings/src/com/android/tv/settings/connectivity/AdvancedWifiOptionsFlow.java
@@ -434,7 +434,7 @@
             if (!TextUtils.isEmpty(dns2)) {
                 try {
                     staticConfig.dnsServers.add(
-                            (Inet4Address) NetworkUtils.numericToInetAddress(dns1));
+                            (Inet4Address) NetworkUtils.numericToInetAddress(dns2));
                 } catch (IllegalArgumentException|ClassCastException e) {
                     return R.string.wifi_ip_settings_invalid_dns;
                 }
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
index af72d20..76d8b2d 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
@@ -58,26 +58,31 @@
     private static final String TAG = "ConnectivityListener";
     private static final boolean DEBUG = false;
 
-    class WifiReceiver extends BroadcastReceiver {
-        public void onReceive(Context context, Intent intent) {
-            for (WifiNetworkListener listener : mWifiNetworkListeners) {
-                listener.onWifiListChanged();
-            }
-        }
-    }
-
     private final Context mContext;
     private final Listener mListener;
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;
-    private boolean mIsRegistered;
+    private boolean mStarted;
 
     private final ConnectivityManager mConnectivityManager;
     private final WifiManager mWifiManager;
-    private WifiReceiver mWifiReceiver;
     private final EthernetManager mEthernetManager;
-    private final ArrayList<WifiNetworkListener> mWifiNetworkListeners =
-            new ArrayList<WifiNetworkListener>();
+    private WifiNetworkListener mWifiListener;
+    private final BroadcastReceiver mWifiReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (mWifiListener != null) {
+                mWifiListener.onWifiListChanged();
+                mWifiListener = null;
+            }
+        }
+    };
+    private final EthernetManager.Listener mEthernetListener = new EthernetManager.Listener() {
+        @Override
+        public void onAvailabilityChanged(boolean isAvailable) {
+            mListener.onConnectivityChange(null);
+        }
+    };
 
     public static class ConnectivityStatus {
         public static final int NETWORK_NONE = 1;
@@ -131,43 +136,43 @@
         };
     }
 
+    /**
+     * Starts {@link ConnectivityListener}.
+     * This should be called only from main thread.
+     */
     public void start() {
-        if (!mIsRegistered) {
-            boolean hasChanged = updateConnectivityStatus();
+        if (!mStarted) {
+            mStarted = true;
+            updateConnectivityStatus();
             mContext.registerReceiver(mReceiver, mFilter);
-            mIsRegistered = true;
+            mContext.registerReceiver(mWifiReceiver, new IntentFilter(
+                    WifiManager.SCAN_RESULTS_AVAILABLE_ACTION));
+            mEthernetManager.addListener(mEthernetListener);
         }
     }
 
+    /**
+     * Stops {@link ConnectivityListener}.
+     * This should be called only from main thread.
+     */
     public void stop() {
-        if (mIsRegistered) {
+        if (mStarted) {
+            mStarted = false;
             mContext.unregisterReceiver(mReceiver);
-            mIsRegistered = false;
-        }
-        if (mWifiReceiver != null) {
             mContext.unregisterReceiver(mWifiReceiver);
-            mWifiReceiver = null;
+            mWifiListener = null;
+            mEthernetManager.removeListener(mEthernetListener);
         }
     }
 
-    public void startScanningWifi(WifiNetworkListener wifiNetworkListener) {
-        if (!mWifiNetworkListeners.contains(wifiNetworkListener)) {
-            mWifiNetworkListeners.add(wifiNetworkListener);
-            if (mWifiNetworkListeners.size () == 1) {
-                mWifiReceiver = new WifiReceiver();
-                mContext.registerReceiver(mWifiReceiver, new IntentFilter(
-                        WifiManager.SCAN_RESULTS_AVAILABLE_ACTION));
-                mWifiManager.startScan();
-            }
-        }
-    }
-
-    public void stopScanningWifi(WifiNetworkListener wifiNetworkListener) {
-        mWifiNetworkListeners.remove(wifiNetworkListener);
-        if (mWifiNetworkListeners.isEmpty() && mWifiReceiver != null) {
-            mContext.unregisterReceiver(mWifiReceiver);
-            mWifiReceiver = null;
-        }
+    /**
+     * Listener is notified when results are available via onWifiListChanged.
+     * Listener should call {@link getAvailableNetworks} to retrieve results.
+     */
+    public void scanWifiAccessPoints(WifiNetworkListener callbackListener) {
+        if (DEBUG) Log.d(TAG, "scanning for wifi access points");
+        mWifiListener = callbackListener;
+        mWifiManager.startScan();
     }
 
     public ConnectivityStatus getConnectivityStatus() {
@@ -197,6 +202,17 @@
         }
     }
 
+    /**
+     * Return whether Ethernet port is available.
+     */
+    public boolean isEthernetAvailable() {
+        if (mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET)) {
+            return mEthernetManager.isAvailable();
+        }
+
+        return false;
+    }
+
     public String getEthernetMacAddress() {
         NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
         if (networkInfo == null ||networkInfo.getType() != ConnectivityManager.TYPE_ETHERNET) {
@@ -263,6 +279,7 @@
      * as the first item on the list.
      */
     public List<ScanResult> getAvailableNetworks() {
+        if (DEBUG) Log.d(TAG, "getAvailableNetworks");
         WifiInfo connectedWifiInfo = mWifiManager.getConnectionInfo();
         String currentConnectedSSID = connectedWifiInfo == null ? "" : connectedWifiInfo.getSSID();
         currentConnectedSSID = WifiInfo.removeDoubleQuotes(currentConnectedSSID);
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkActivity.java b/Settings/src/com/android/tv/settings/connectivity/NetworkActivity.java
index 61ad222..69064aa 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkActivity.java
@@ -31,7 +31,6 @@
 import android.os.Handler;
 import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.Pair;
 
 import com.android.tv.settings.dialog.SettingsLayoutActivity;
@@ -53,46 +52,72 @@
  * Activity to manage network settings.
  */
 public class NetworkActivity extends SettingsLayoutActivity implements
-        ConnectivityListener.Listener {
+        ConnectivityListener.Listener, ConnectivityListener.WifiNetworkListener {
 
-    private static final boolean DEBUG = false;
-    private static final String TAG = "NetworkActivity";
     private static final int REQUEST_CODE_ADVANCED_OPTIONS = 1;
-    private static final int WIFI_REFRESH_INTERVAL_CAP_MILLIS = 15 * 1000;
+    private static final int WIFI_SCAN_INTERVAL_CAP_MILLIS = 10 * 1000;
+    private static final int WIFI_UI_REFRESH_INTERVAL_CAP_MILLIS = 15 * 1000;
 
     private ConnectivityListener mConnectivityListener;
     private Resources mRes;
     private Handler mHandler = new Handler();
+    private final Runnable mRefreshWifiAccessPoints = new Runnable() {
+        @Override
+        public void run() {
+            mConnectivityListener.scanWifiAccessPoints(NetworkActivity.this);
+            mHandler.removeCallbacks(mRefreshWifiAccessPoints);
+            mHandler.postDelayed(mRefreshWifiAccessPoints, WIFI_SCAN_INTERVAL_CAP_MILLIS);
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         mRes = getResources();
         mConnectivityListener = new ConnectivityListener(this, this);
+        // The ConectivityListenter must be started before calling "super.OnCreate(.)" to ensure
+        // that connectivity status is available before the layout is constructed.
         mConnectivityListener.start();
         super.onCreate(savedInstanceState);
     }
 
     @Override
-    protected void onDestroy(){
-        super.onDestroy();
-        mConnectivityListener.stop();
+    public void onResume() {
+        mConnectivityListener.start();
+        mHandler.removeCallbacks(mRefreshWifiAccessPoints);
+        mHandler.post(mRefreshWifiAccessPoints);
+        onConnectivityChange(null);
+
+        // TODO(lanechr): It's an anti-pattern that we have to notify Layout here; see b/18889239.
+        mWifiAdvancedLayout.refreshView();
+
+        super.onResume();
     }
 
     @Override
+    protected void onPause() {
+        mHandler.removeCallbacks(mRefreshWifiAccessPoints);
+        mConnectivityListener.stop();
+        super.onPause();
+    }
+
+    @Override
+    protected void onDestroy(){
+        mConnectivityListener = null;
+        super.onDestroy();
+    }
+
+    // ConnectivityListener.Listener overrides.
+    @Override
     public void onConnectivityChange(Intent intent) {
         mEthernetConnectedDescription.refreshView();
         mWifiConnectedDescription.refreshView();
+        onWifiListChanged();
     }
 
     @Override
-    public void onResume() {
-        if (mWifiShortListLayout != null) {
-            mWifiShortListLayout.onWifiListInvalidated();
-        }
-        if (mWifiAllListLayout != null) {
-            mWifiAllListLayout.onWifiListInvalidated();
-        }
-        super.onResume();
+    public void onWifiListChanged() {
+        mWifiShortListLayout.onWifiListChanged();
+        mWifiAllListLayout.onWifiListChanged();
     }
 
     StringGetter mEthernetConnectedDescription = new StringGetter() {
@@ -224,46 +249,6 @@
 
     private final Context mContext = this;
 
-    private int getCurrentNetworkIconResourceId(
-            ScanResult scanResult, int signalLevel) {
-        int resourceId = 0;
-        if (scanResult != null) {
-            WifiSecurity security = WifiSecurity.getSecurity(scanResult);
-            if (security.isOpen()) {
-                switch (signalLevel) {
-                    case 0:
-                        resourceId = R.drawable.ic_settings_wifi_active_1;
-                        break;
-                    case 1:
-                        resourceId = R.drawable.ic_settings_wifi_active_2;
-                        break;
-                    case 2:
-                        resourceId = R.drawable.ic_settings_wifi_active_3;
-                        break;
-                    case 3:
-                        resourceId = R.drawable.ic_settings_wifi_active_4;
-                        break;
-                }
-            } else {
-                switch (signalLevel) {
-                    case 0:
-                        resourceId = R.drawable.ic_settings_wifi_secure_active_1;
-                        break;
-                    case 1:
-                        resourceId = R.drawable.ic_settings_wifi_secure_active_2;
-                        break;
-                    case 2:
-                        resourceId = R.drawable.ic_settings_wifi_secure_active_3;
-                        break;
-                    case 3:
-                        resourceId = R.drawable.ic_settings_wifi_secure_active_4;
-                        break;
-                }
-            }
-        }
-        return resourceId;
-    }
-
     private String getSignalStrength() {
         String[] signalLevels = mRes.getStringArray(R.array.wifi_signal_strength);
         int strength = mConnectivityListener.getWifiSignalStrength(signalLevels.length);
@@ -330,10 +315,37 @@
         }
     };
 
-    private void addWifiConnectedHeader(Layout layout, String SSID) {
+    LayoutGetter mWifiLayout = new LayoutGetter() {
+        public Layout get() {
+            return new Layout()
+                .add(new Static.Builder(mRes)
+                        .title(R.string.wifi_setting_available_networks)
+                        .build())
+                .add(mWifiShortListLayout)
+                .add(new Header.Builder(mRes)
+                        .title(R.string.wifi_setting_see_all)
+                        .build()
+                    .add(mWifiAllListLayout)
+                )
+                .add(new Static.Builder(mRes)
+                        .title(R.string.wifi_setting_header_other_options)
+                        .build())
+                .add(new Action.Builder(mRes,
+                         new Intent(NetworkActivity.this, WpsConnectionActivity.class))
+                        .title(R.string.wifi_setting_other_options_wps)
+                        .build())
+                .add(new Action.Builder(mRes,
+                        new Intent(NetworkActivity.this, AddWifiNetworkActivity.class))
+                        .title(R.string.wifi_setting_other_options_add_network)
+                        .build());
+        }
+    };
+
+    private void addWifiConnectedHeader(Layout layout, String SSID, int iconResId) {
         layout
             .add(new Header.Builder(mRes)
                     .title(SSID)
+                    .icon(iconResId)
                     .description(R.string.connected).build()
                 .add(new Header.Builder(mRes)
                         .title(R.string.wifi_action_status_info).build()
@@ -353,8 +365,7 @@
             );
     }
 
-    private class WifiListLayout extends LayoutGetter implements
-            ConnectivityListener.WifiNetworkListener {
+    private class WifiListLayout extends LayoutGetter {
         private final boolean mTop3EntriesOnly;
         private String mSelectedTitle;
         private long mLastWifiRefresh = 0;
@@ -376,24 +387,20 @@
 
         @Override
         public Layout get() {
-            mConnectivityListener.startScanningWifi(this);
             mLastWifiRefresh = SystemClock.elapsedRealtime();
             mHandler.removeCallbacks(mRefreshViewRunnable);
             return initAvailableWifiNetworks(mTop3EntriesOnly, mSelectedTitle).
                     setSelectedByTitle(mSelectedTitle);
         }
 
-        @Override
-        public void onMovedOffScreen() {
-            mHandler.removeCallbacks(mRefreshViewRunnable);
-            mConnectivityListener.stopScanningWifi(this);
-        }
-
-        @Override
+        /**
+         * Wifi network list has changed and an eventual refresh of the UI is required.
+         * Rate limit the UI refresh to once per WIFI_UI_REFRESH_INTERVAL_CAP_MILLIS.
+         */
         public void onWifiListChanged() {
             long now = SystemClock.elapsedRealtime();
             long millisToNextRefreshView =
-                    WIFI_REFRESH_INTERVAL_CAP_MILLIS - now + mLastWifiRefresh;
+                    WIFI_UI_REFRESH_INTERVAL_CAP_MILLIS - now + mLastWifiRefresh;
             mHandler.removeCallbacks(mRefreshViewRunnable);
             mHandler.postDelayed(mRefreshViewRunnable, millisToNextRefreshView);
         }
@@ -403,8 +410,8 @@
          * networks is required.
          */
         public void onWifiListInvalidated() {
-            mLastWifiRefresh = 0;
-            onWifiListChanged();
+            mHandler.removeCallbacks(mRefreshViewRunnable);
+            mHandler.post(mRefreshViewRunnable);
         }
 
         /**
@@ -448,29 +455,20 @@
                 for (ScanResult network : displayList) {
                     if (network != null) {
                         WifiSecurity security = WifiSecurity.getSecurity(network);
-
-                        String networkDescription =
-                            security.isOpen() ? "" : security.getName(mContext);
-                        Intent intent =
-                            WifiConnectionActivity.createIntent(mContext, network, security);
                         int signalLevel = WifiManager.calculateSignalLevel(
                                 network.level, NUMBER_SIGNAL_LEVELS);
-                        //TODO implement signal dependent list icon.
-                        /*
-                        int imageResourceId = getNetworkIconResourceId(network, signalLevel);
-                        if (WifiConfigHelper.areSameNetwork(mWifiManager, network,
-                                currentConnection)) {
-                            networkDescription = getString(R.string.connected);
-                            signalLevel = WifiManager.calculateSignalLevel(
-                                    currentConnection.getRssi(), NUMBER_SIGNAL_LEVELS);
-                            imageResourceId = getCurrentNetworkIconResourceId(network, signalLevel);
-                        } */
+                        int imageResourceId = getNetworkIconRes(security.isOpen(), signalLevel);
 
                         if (isConnected) {
-                            addWifiConnectedHeader(layout, network.SSID);
+                            addWifiConnectedHeader(layout, network.SSID, imageResourceId);
                         } else {
+                            Intent intent =
+                                WifiConnectionActivity.createIntent(mContext, network, security);
+                            String networkDescription =
+                                security.isOpen() ? "" : security.getName(mContext);
                             layout.add(new Action.Builder(mRes, intent)
                                     .title(network.SSID)
+                                    .icon(imageResourceId)
                                     .description(networkDescription).build());
                         }
                     }
@@ -490,46 +488,39 @@
 
     @Override
     public Layout createLayout() {
-        return
-            new Layout()
+        // Note: This only updates the layout the activity is loaded,
+        //       not if the user plugs/unplugs in an adapter.
+        if (mConnectivityListener.isEthernetAvailable()) {
+            return new Layout()
                 .breadcrumb(getString(R.string.header_category_device))
                 .add(new Header.Builder(mRes)
                         .icon(R.drawable.ic_settings_wifi_4)
                         .title(R.string.connectivity_network)
                         .description(mWifiConnectedDescription)
                         .build()
-                    .add(new Header.Builder(mRes).title(R.string.connectivity_wifi)
+                    .add(new Header.Builder(mRes)
+                            .title(R.string.connectivity_wifi)
                             .contentIconRes(R.drawable.ic_settings_wifi_4)
-                            .description(mWifiConnectedDescription).build()
-                        .add(new Static.Builder(mRes)
-                                .title(R.string.wifi_setting_available_networks)
-                                .build())
-                        .add(mWifiShortListLayout)
-                        .add(new Header.Builder(mRes)
-                                .title(R.string.wifi_setting_see_all)
-                                .build()
-                            .add(mWifiAllListLayout)
-                        )
-                        .add(new Static.Builder(mRes)
-                                .title(R.string.wifi_setting_header_other_options)
-                                .build())
-                        .add(new Action.Builder(mRes,
-                                 new Intent(this, WpsConnectionActivity.class))
-                                .title(R.string.wifi_setting_other_options_wps)
-                                .build())
-                        .add(new Action.Builder(mRes,
-                                new Intent(this, AddWifiNetworkActivity.class))
-                                .title(R.string.wifi_setting_other_options_add_network)
-                                .build())
-                    )
+                            .description(mWifiConnectedDescription)
+                            .build()
+                        .add(mWifiLayout))
                     .add(new Header.Builder(mRes)
                             .title(R.string.connectivity_ethernet)
                             .contentIconRes(R.drawable.ic_settings_ethernet)
                             .description(mEthernetConnectedDescription)
                             .build()
-                        .add(mEthernetLayout)
-                     )
-                 );
+                        .add(mEthernetLayout)));
+        } else {
+            // Only Wifi is available.
+            return new Layout()
+                .breadcrumb(getString(R.string.header_category_device))
+                .add(new Header.Builder(mRes)
+                        .icon(R.drawable.ic_settings_wifi_4)
+                        .title(R.string.connectivity_wifi)
+                        .description(mWifiConnectedDescription)
+                        .build()
+                    .add(mWifiLayout));
+        }
     }
 
     @Override
@@ -591,4 +582,42 @@
             }
         }
     }
+
+    private int getNetworkIconRes(boolean isOpen, int signalLevel) {
+        int resourceId = R.drawable.ic_settings_wifi_not_connected;
+
+        if (isOpen) {
+            switch (signalLevel) {
+                case 0:
+                    resourceId = R.drawable.ic_settings_wifi_1;
+                    break;
+                case 1:
+                    resourceId = R.drawable.ic_settings_wifi_2;
+                    break;
+                case 2:
+                    resourceId = R.drawable.ic_settings_wifi_3;
+                    break;
+                case 3:
+                    resourceId = R.drawable.ic_settings_wifi_4;
+                    break;
+            }
+        } else {
+            switch (signalLevel) {
+                case 0:
+                    resourceId = R.drawable.ic_settings_wifi_secure_1;
+                    break;
+                case 1:
+                    resourceId = R.drawable.ic_settings_wifi_secure_2;
+                    break;
+                case 2:
+                    resourceId = R.drawable.ic_settings_wifi_secure_3;
+                    break;
+                case 3:
+                    resourceId = R.drawable.ic_settings_wifi_secure_4;
+                    break;
+            }
+        }
+
+        return resourceId;
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java b/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
index 9e61b10..7fd09ec 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
@@ -271,6 +271,20 @@
         }
     }
 
+    /**
+     * Forget the current wifi connection.
+     */
+    public static void forgetWifiNetwork(Context context) {
+        WifiManager mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+        if (wifiInfo != null) {
+            int networkId = wifiInfo.getNetworkId();
+            if (networkId != -1) {
+                mWifiManager.forget(networkId, null);
+            }
+        }
+    }
+
     private static String enquoteSsid(String ssid) {
         return "\"".concat(ssid.replace("\"", "\\\"")).concat("\"");
     }
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiFormPageType.java b/Settings/src/com/android/tv/settings/connectivity/WifiFormPageType.java
index 3b9f0b8..cbcc61e 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiFormPageType.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiFormPageType.java
@@ -31,8 +31,8 @@
  */
 public enum WifiFormPageType implements FormPageDisplayer.FormPageInfo {
     CHOOSE_NETWORK(FormPageDisplayer.DISPLAY_TYPE_LIST_CHOICE, R.string.title_select_wifi_network,
-            0, new int[] { R.string.wps_network, R.string.other_network },
-            new int[] { R.drawable.ic_wps, R.drawable.ic_menu_add }),
+            0, new int[] { R.string.other_network },
+            new int[] { R.drawable.ic_menu_add }),
     ENTER_SSID(FormPageDisplayer.DISPLAY_TYPE_TEXT_INPUT, R.string.title_ssid, 0,
             TextInputWizardFragment.INPUT_TYPE_NO_SUGGESTIONS),
     CHOOSE_SECURITY(FormPageDisplayer.DISPLAY_TYPE_LIST_CHOICE, R.string.security_type, 0,
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiNetworksBrowseInfo.java b/Settings/src/com/android/tv/settings/connectivity/WifiNetworksBrowseInfo.java
index 5eda5e2..933987a 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiNetworksBrowseInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiNetworksBrowseInfo.java
@@ -80,11 +80,6 @@
         mRows.put(SECOND_HEADER_ID, new ArrayObjectAdapter());
     }
 
-    @Override
-    public void refreshContent() {
-        init();
-    }
-
     public void onShutdown() {
         stopScanning();
         mIdToSsidMap.clear();
@@ -111,7 +106,7 @@
     }
 
     private void addBrowseHeader(int id, String name) {
-        mHeaderItems.add(new HeaderItem(id, name, null));
+        mHeaderItems.add(new HeaderItem(id, name));
     }
 
     private void initAvailableNetworksBrowseItems(ArrayObjectAdapter row) {
diff --git a/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java b/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java
index a1b6b76..7763f47 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java
@@ -41,16 +41,11 @@
 
     public static final String EXTRA_WPS_SETUP = "wps_setup";
 
-    public static Intent createIntent(Context context, int wpsSetup) {
-        return new Intent(context, WpsConnectionActivity.class).putExtra(EXTRA_WPS_SETUP, wpsSetup);
-    }
-
     private static final String WPS_FRAGMENT_TAG = "wps_fragment_tag";
     private static final String KEY_CANCEL = "cancel";
     private static final String KEY_RETRY = "retry";
 
     private WifiManager mWifiManager;
-    private int mWpsSetup;
     private boolean mWpsComplete;
     private final WpsCallback mWpsCallback = new WpsCallback() {
         @Override
@@ -101,7 +96,6 @@
         setLayoutProperties(R.layout.setup_auth_activity, R.id.description, R.id.action);
         super.onCreate(savedInstanceState);
         Bundle extras = getIntent().getExtras();
-        mWpsSetup = getIntent().getIntExtra(EXTRA_WPS_SETUP, 0);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
     }
 
@@ -142,10 +136,8 @@
         }
         mWpsComplete = false;
         WpsInfo wpsConfig = new WpsInfo();
-        wpsConfig.setup = mWpsSetup;
-        if (!mWpsComplete) {
-            mWifiManager.startWps(wpsConfig, mWpsCallback);
-        }
+        wpsConfig.setup = WpsInfo.PBC;
+        mWifiManager.startWps(wpsConfig, mWpsCallback);
     }
 
     private Fragment createWpsScanningFragment() {
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
index 522d128..39aa6f0 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
@@ -35,7 +35,6 @@
 import com.android.tv.settings.form.FormPageResultListener;
 
 import android.animation.Animator;
-import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
 import android.app.Fragment;
 import android.app.FragmentManager;
@@ -52,9 +51,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.Pair;
-import android.util.TypedValue;
 import android.view.View;
 
 import java.util.ArrayList;
@@ -72,10 +69,13 @@
     private static final int MSG_NETWORK_REFRESH = 1;
     private static final int NETWORK_REFRESH_TIMEOUT = 5000;
     private static final String EXTRA_SHOW_SUMMARY = "extra_show_summary";
+    private static final String EXTRA_SHOW_SKIP_NETWORK = "extra_show_skip_network";
+    private static final String EXTRA_SHOW_WPS_AT_TOP = "extra_show_wps_at_top";
     // If you change this constant, make sure to change the constant in setup wizard
     private static final int RESULT_NETWORK_SKIPPED = 3;
 
-    private boolean mFirstRun;
+    private boolean mShowSkipNetwork;
+    private boolean mShowWpsAtTop;
     private AdvancedWifiOptionsFlow mAdvancedWifiOptionsFlow;
     private WifiManager mWifiManager;
     private WifiConfiguration mConfiguration;
@@ -117,6 +117,8 @@
         };
 
         boolean showSummary = getIntent().getBooleanExtra(EXTRA_SHOW_SUMMARY, false);
+        mShowSkipNetwork = getIntent().getBooleanExtra(EXTRA_SHOW_SKIP_NETWORK, false);
+        mShowWpsAtTop = getIntent().getBooleanExtra(EXTRA_SHOW_WPS_AT_TOP, false);
 
         if (showSummary) {
             addSummaryPage();
@@ -203,6 +205,7 @@
                 break;
             case CHOOSE_NETWORK:
                 if (choiceChosen(formPage, R.string.skip_network)) {
+                    WifiConfigHelper.forgetWifiNetwork(this);
                     setResult(RESULT_NETWORK_SKIPPED);
                 } else {
                     mHandler.removeMessages(MSG_NETWORK_REFRESH);
@@ -264,8 +267,6 @@
                         break;
                 }
                 break;
-            case CONNECT_FAILED:
-                // fall through
             case CONNECT_TIMEOUT:
                 mAdvancedWifiOptionsFlow = new AdvancedWifiOptionsFlow(this, this, true, null);
                 // fall through
@@ -279,6 +280,8 @@
                     addPage(WifiFormPageType.CHOOSE_NETWORK);
                 }
                 break;
+            case CONNECT_FAILED:
+                // fall through
             case CONNECT_AUTHENTICATION_FAILURE:
                 if (choiceChosen(formPage, R.string.wifi_action_try_again)) {
                     addPageBasedOnNetworkChoice(mChooseNetworkPage);
@@ -431,6 +434,20 @@
             listItems.add(new SelectFromListWizardFragment.ListItem(result));
         }
         Collections.sort(listItems, new SelectFromListWizardFragment.ListItemComparator());
+
+        SelectFromListWizardFragment.ListItem wpsItem = new SelectFromListWizardFragment.ListItem(
+                getString(R.string.wps_network).toUpperCase(), R.drawable.ic_setup_wps);
+        if (mShowWpsAtTop) {
+            listItems.add(0, wpsItem);
+        } else {
+            listItems.add(wpsItem);
+        }
+
+        if (mShowSkipNetwork) {
+            listItems.add(new SelectFromListWizardFragment.ListItem(
+                   getString(R.string.skip_network).toUpperCase(), 0));
+        }
+
         return listItems;
     }
 
@@ -439,7 +456,7 @@
             mConfiguration.hiddenSSID = true;
             addPage(WifiFormPageType.ENTER_SSID);
         } else if (choiceChosen(chooseNetworkPage, R.string.wps_network)) {
-            addPage(WifiFormPageType.WPS, WpsConnectionActivity.createIntent(this, 1)
+            addPage(WifiFormPageType.WPS, new Intent(this, WpsConnectionActivity.class)
                     .putExtras(getIntent().getExtras()));
         } else {
             ScanResult scanResult = getListItem(chooseNetworkPage).getScanResult();
diff --git a/Settings/src/com/android/tv/settings/device/StorageResetActivity.java b/Settings/src/com/android/tv/settings/device/StorageResetActivity.java
index 3149f4a..08acc94 100644
--- a/Settings/src/com/android/tv/settings/device/StorageResetActivity.java
+++ b/Settings/src/com/android/tv/settings/device/StorageResetActivity.java
@@ -17,7 +17,14 @@
 package com.android.tv.settings.device;
 
 import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -26,6 +33,7 @@
 import android.os.Message;
 import android.text.format.Formatter;
 
+import com.android.tv.settings.device.apps.AppsActivity;
 import com.android.tv.settings.device.storage.StorageItem;
 import com.android.tv.settings.device.storage.StorageMeasurement;
 import com.android.tv.settings.device.storage.StorageMeasurement.MeasurementDetails;
@@ -60,6 +68,7 @@
     private static final long INVALID_SIZE = -1;
     private static final int ACTION_RESET_DEVICE = 1;
     private static final int ACTION_CANCEL = 2;
+    private static final int ACTION_CLEAR_CACHE = 3;
 
     /**
      * Support for shutdown-after-reset. If our launch intent has a true value for
@@ -160,6 +169,7 @@
 
     @Override
     public Layout createLayout() {
+        final Intent appsIntent = new Intent(this, AppsActivity.class);
         return
             new Layout().breadcrumb(getString(R.string.header_category_device))
                 .add(new Header.Builder(mRes)
@@ -170,7 +180,7 @@
                             .title(R.string.storage_title)
                             .description(mStorageDescription)
                             .build()
-                        .add(new Status.Builder(mRes)
+                        .add(new Action.Builder(mRes, appsIntent)
                             .title(R.string.storage_apps_usage)
                             .icon(R.drawable.storage_indicator_apps)
                             .description(mAppsSize)
@@ -190,7 +200,7 @@
                             .icon(R.drawable.storage_indicator_downloads)
                             .description(mDownloadsSize)
                             .build())
-                        .add(new Status.Builder(mRes)
+                        .add(new Action.Builder(mRes, ACTION_CLEAR_CACHE)
                             .title(R.string.storage_media_cache_usage)
                             .icon(R.drawable.storage_indicator_cache)
                             .description(mCacheSize)
@@ -244,6 +254,15 @@
             case ACTION_CANCEL:
                 goBackToTitle(getString(R.string.device_storage_reset));
                 break;
+            case ACTION_CLEAR_CACHE:
+                final DialogFragment fragment = ConfirmClearCacheFragment.newInstance();
+                fragment.show(getFragmentManager(), null);
+                break;
+            default:
+                final Intent intent = action.getIntent();
+                if (intent != null) {
+                    startActivity(intent);
+                }
         }
     }
 
@@ -318,7 +337,9 @@
     private static long totalValues(HashMap<String, Long> map, String... keys) {
         long total = 0;
         for (String key : keys) {
-            total += map.get(key);
+            if (map.containsKey(key)) {
+                total += map.get(key);
+            }
         }
         return total;
     }
@@ -327,4 +348,37 @@
         return (size == INVALID_SIZE) ? getString(R.string.storage_calculating_size)
                 : Formatter.formatShortFileSize(this, size);
     }
+
+    /**
+     * Dialog to request user confirmation before clearing all cache data.
+     */
+    public static class ConfirmClearCacheFragment extends DialogFragment {
+        public static ConfirmClearCacheFragment newInstance() {
+            return new ConfirmClearCacheFragment();
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.device_storage_clear_cache_title);
+            builder.setMessage(getString(R.string.device_storage_clear_cache_message));
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    final PackageManager pm = context.getPackageManager();
+                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
+                    for (PackageInfo info : infos) {
+                        pm.deleteApplicationCacheFiles(info.packageName, null);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
 }
diff --git a/Settings/src/com/android/tv/settings/device/apps/ActionType.java b/Settings/src/com/android/tv/settings/device/apps/ActionType.java
index 91f22b8..514c0b0 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ActionType.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ActionType.java
@@ -39,6 +39,14 @@
             ActionBehavior.CANCEL },
             R.string.device_apps_app_management_uninstall,
             R.string.device_apps_app_management_uninstall_desc),
+    DISABLE(new ActionBehavior[] { ActionBehavior.INIT, ActionBehavior.OK,
+            ActionBehavior.CANCEL },
+            R.string.device_apps_app_management_disable,
+            R.string.device_apps_app_management_disable_desc),
+    ENABLE(new ActionBehavior[] { ActionBehavior.INIT, ActionBehavior.OK,
+            ActionBehavior.CANCEL },
+            R.string.device_apps_app_management_enable,
+            R.string.device_apps_app_management_enable_desc),
     CLEAR_DATA(new ActionBehavior[] { ActionBehavior.INIT, ActionBehavior.OK,
             ActionBehavior.CANCEL },
             R.string.device_apps_app_management_clear_data,
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppInfo.java b/Settings/src/com/android/tv/settings/device/apps/AppInfo.java
index b569238..e74833e 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppInfo.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppInfo.java
@@ -91,6 +91,12 @@
         }
     }
 
+    boolean isEnabled() {
+        synchronized (mLock) {
+            return mEntry.info.enabled;
+        }
+    }
+
     boolean isSystemApp() {
         synchronized (mLock) {
             return (mEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppManagementActivity.java b/Settings/src/com/android/tv/settings/device/apps/AppManagementActivity.java
index 5e06d61..1d0cecf 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppManagementActivity.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppManagementActivity.java
@@ -30,10 +30,14 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
 /**
@@ -70,6 +74,8 @@
         super.onCreate(savedInstanceState);
         mPackageName = getIntent().getStringExtra(EXTRA_PACKAGE_NAME_KEY);
         mApplicationsState = ApplicationsState.getInstance(getApplication());
+        mSession = mApplicationsState.newSession(this);
+        mSession.resume();
         mAppInfo = new AppInfo(this, mApplicationsState.getEntry(mPackageName));
         mOpenManager = new OpenManager(this, mAppInfo);
         mForceStopManager = new ForceStopManager(this, mAppInfo);
@@ -79,8 +85,6 @@
         mDefaultClearer = new DefaultClearer(this, mAppInfo);
         mCacheClearer = new CacheClearer(this, mAppInfo);
         mActionFragment = ActionFragment.newInstance(getActions());
-        mSession = mApplicationsState.newSession(this);
-        mSession.resume();
 
         setContentAndActionFragments(ContentFragment.newInstance(mAppInfo.getName(),
                 getString(R.string.device_apps),
@@ -97,6 +101,41 @@
         return i;
     }
 
+    private void refreshUpdateActions() {
+        mApplicationsState = ApplicationsState.getInstance(getApplication());
+        mAppInfo = new AppInfo(this, mApplicationsState.getEntry(mPackageName));
+        mUninstallManager = new UninstallManager(this, mAppInfo);
+        updateActions();
+    }
+
+    static class DisableChanger extends AsyncTask<Void, Void, Void> {
+        final PackageManager mPm;
+        final WeakReference<AppManagementActivity> mActivity;
+        final ApplicationInfo mInfo;
+        final int mState;
+
+        DisableChanger(AppManagementActivity activity, ApplicationInfo info, int state) {
+            mPm = activity.getPackageManager();
+            mActivity = new WeakReference<AppManagementActivity>(activity);
+            mInfo = info;
+            mState = state;
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            mPm.setApplicationEnabledSetting(mInfo.packageName, mState, 0);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            AppManagementActivity activity = mActivity.get();
+            if (activity != null) {
+                activity.refreshUpdateActions();
+            }
+        }
+    }
+
     @Override
     public void onActionClicked(Action action) {
         ActionKey<ActionType, ActionBehavior> actionKey = new ActionKey<ActionType, ActionBehavior>(
@@ -248,6 +287,12 @@
             case UNINSTALL:
                 onUninstallOk();
                 break;
+            case DISABLE:
+                onDisableOk();
+                break;
+            case ENABLE:
+                onEnableOk();
+                break;
             default:
                 break;
         }
@@ -281,6 +326,18 @@
         mUninstallManager.uninstall(REQUEST_UNINSTALL);
     }
 
+    private void onDisableOk() {
+        new DisableChanger(this, mAppInfo.getApplicationInfo(),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER).execute();
+        goToActionSelectScreen();
+    }
+
+    private void onEnableOk() {
+        new DisableChanger(this, mAppInfo.getApplicationInfo(),
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).execute();
+        goToActionSelectScreen();
+    }
+
     private void onNotificationsOn() {
         if (!mNotificationSetter.enableNotifications()) {
             Log.w(TAG, "Failed to enable notifications!");
@@ -340,6 +397,15 @@
         }
         if (mUninstallManager.canUninstall()) {
             actions.add(ActionType.UNINSTALL.toInitAction(getResources()));
+        } else {
+            // App is on system partition.
+            if (mUninstallManager.canDisable()) {
+                if (mUninstallManager.isEnabled()) {
+                    actions.add(ActionType.DISABLE.toInitAction(getResources()));
+                } else {
+                    actions.add(ActionType.ENABLE.toInitAction(getResources()));
+                }
+            }
         }
         actions.add(
                 ActionType.CLEAR_DATA.toInitAction(getResources(), mDataClearer.getDataSize(this)));
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppsBrowseInfo.java b/Settings/src/com/android/tv/settings/device/apps/AppsBrowseInfo.java
index 5bcdc4d..48c63b0 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppsBrowseInfo.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppsBrowseInfo.java
@@ -69,13 +69,6 @@
     }
 
     @Override
-    public void refreshContent() {
-        mHeaderItems.clear();
-        loadBrowseHeaders();
-        updateAppList();
-    }
-
-    @Override
     public void onRunningStateChanged(boolean running) {
     }
 
@@ -150,9 +143,9 @@
     }
 
     private void loadBrowseHeaders() {
-        mHeaderItems.add(new HeaderItem(DOWNLOADED_ID, mContext.getString(R.string.apps_downloaded), null));
-        mHeaderItems.add(new HeaderItem(SYSTEM_ID, mContext.getString(R.string.apps_system), null));
-        mHeaderItems.add(new HeaderItem(RUNNING_ID, mContext.getString(R.string.apps_running), null));
+        mHeaderItems.add(new HeaderItem(DOWNLOADED_ID, mContext.getString(R.string.apps_downloaded)));
+        mHeaderItems.add(new HeaderItem(SYSTEM_ID, mContext.getString(R.string.apps_system)));
+        mHeaderItems.add(new HeaderItem(RUNNING_ID, mContext.getString(R.string.apps_running)));
     }
 
     void init() {
diff --git a/Settings/src/com/android/tv/settings/device/apps/UninstallManager.java b/Settings/src/com/android/tv/settings/device/apps/UninstallManager.java
index c653270..3c04f7c 100644
--- a/Settings/src/com/android/tv/settings/device/apps/UninstallManager.java
+++ b/Settings/src/com/android/tv/settings/device/apps/UninstallManager.java
@@ -17,8 +17,19 @@
 package com.android.tv.settings.device.apps;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.Signature;
 import android.net.Uri;
+import android.os.Bundle;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * Handles uninstalling of an application.
@@ -27,6 +38,7 @@
 
     private final Activity mActivity;
     private final AppInfo mAppInfo;
+    private static Signature[] sSystemSignature;
 
     UninstallManager(Activity activity, AppInfo appInfo) {
         mActivity = activity;
@@ -37,6 +49,89 @@
         return !mAppInfo.isUpdatedSystemApp() && !mAppInfo.isSystemApp();
     }
 
+    boolean isEnabled() {
+        return mAppInfo.isEnabled();
+    }
+
+    private static boolean signaturesMatch(PackageManager pm, String pkg1, String pkg2) {
+        if (pkg1 != null && pkg2 != null) {
+            try {
+                final int match = pm.checkSignatures(pkg1, pkg2);
+                if (match >= PackageManager.SIGNATURE_MATCH) {
+                    return true;
+                }
+            } catch (Exception e) {
+                // e.g. named alternate package not found during lookup;
+                // this is an expected case sometimes
+            }
+        }
+        return false;
+    }
+
+    private HashSet<String> getHomePackages(PackageManager pm) {
+        HashSet<String> homePackages = new HashSet<String>();
+        // Get list of "home" apps and trace through any meta-data references
+        List<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        pm.getHomeActivities(homeActivities);
+        for (int i = 0; i < homeActivities.size(); i++) {
+            ResolveInfo ri = homeActivities.get(i);
+            final String activityPkg = ri.activityInfo.packageName;
+            homePackages.add(activityPkg);
+            // Also make sure to include anything proxying for the home app
+            final Bundle metadata = ri.activityInfo.metaData;
+            if (metadata != null) {
+                final String metaPkg = metadata.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (signaturesMatch(pm, metaPkg, activityPkg)) {
+                    homePackages.add(metaPkg);
+                }
+            }
+        }
+        return homePackages;
+    }
+
+    private static Signature getFirstSignature(PackageInfo pkg) {
+        if (pkg != null && pkg.signatures != null && pkg.signatures.length > 0) {
+            return pkg.signatures[0];
+        }
+        return null;
+    }
+
+    private static Signature getSystemSignature(PackageManager pm) {
+        try {
+            final PackageInfo sys = pm.getPackageInfo("android", PackageManager.GET_SIGNATURES);
+            return getFirstSignature(sys);
+        } catch (NameNotFoundException e) {
+        }
+        return null;
+    }
+
+    /**
+     * Determine whether a package is a "system package", in which case certain things (like
+     * disabling notifications or disabling the package altogether) should be disallowed.
+     */
+    public static boolean isSystemPackage(PackageManager pm, PackageInfo pkg) {
+        if (sSystemSignature == null) {
+            sSystemSignature = new Signature[]{ getSystemSignature(pm) };
+        }
+        return sSystemSignature[0] != null && sSystemSignature[0].equals(getFirstSignature(pkg));
+    }
+
+    boolean canDisable() {
+        final PackageManager pm = mActivity.getPackageManager();
+        final HashSet<String> homePackages = getHomePackages(pm);
+        PackageInfo packageInfo;
+        try {
+            packageInfo = pm.getPackageInfo(mAppInfo.getPackageName(),
+                    PackageManager.GET_DISABLED_COMPONENTS |
+                    PackageManager.GET_UNINSTALLED_PACKAGES |
+                    PackageManager.GET_SIGNATURES);
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+        return ! (homePackages.contains(mAppInfo.getPackageName()) ||
+                isSystemPackage(pm, packageInfo));
+    }
+
     void uninstall(int requestId) {
         if (canUninstall()) {
             uninstallPackage(!mAppInfo.isInstalled(), requestId);
diff --git a/Settings/src/com/android/tv/settings/device/display/DisplayBrowseInfo.java b/Settings/src/com/android/tv/settings/device/display/DisplayBrowseInfo.java
index 5bde12c..21fb228 100644
--- a/Settings/src/com/android/tv/settings/device/display/DisplayBrowseInfo.java
+++ b/Settings/src/com/android/tv/settings/device/display/DisplayBrowseInfo.java
@@ -41,15 +41,10 @@
     DisplayBrowseInfo(Context context) {
         mContext = context;
         mNextItemId = 0;
-        mHeaderItems.add(new HeaderItem(HEADER_ID, mContext.getString(R.string.device_display), null));
+        mHeaderItems.add(new HeaderItem(HEADER_ID, mContext.getString(R.string.device_display)));
         mRows.put(HEADER_ID, mRow);
     }
 
-    @Override
-    public void refreshContent() {
-        init();
-    }
-
     void init() {
         mRow.clear();
 
diff --git a/Settings/src/com/android/tv/settings/dialog/DialogFragment.java b/Settings/src/com/android/tv/settings/dialog/DialogFragment.java
index 4a6178a..3b61c47 100644
--- a/Settings/src/com/android/tv/settings/dialog/DialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/DialogFragment.java
@@ -42,6 +42,7 @@
 import android.os.Parcelable;
 import android.support.v17.leanback.R;
 import android.support.v17.leanback.widget.VerticalGridView;
+import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -310,37 +311,37 @@
 
         switch (nextAnim) {
             case ANIMATION_FRAGMENT_ENTER:
-                animators.add(createSlideLeftInAnimator(titleView));
-                animators.add(createSlideLeftInAnimator(breadcrumbView));
-                animators.add(createSlideLeftInAnimator(descriptionView));
-                animators.add(createSlideLeftInAnimator(iconView));
-                animators.add(createSlideLeftInAnimator(listView));
-                animators.add(createSlideLeftInAnimator(selectorView));
+                animators.add(createSlideInFromEndAnimator(titleView));
+                animators.add(createSlideInFromEndAnimator(breadcrumbView));
+                animators.add(createSlideInFromEndAnimator(descriptionView));
+                animators.add(createSlideInFromEndAnimator(iconView));
+                animators.add(createSlideInFromEndAnimator(listView));
+                animators.add(createSlideInFromEndAnimator(selectorView));
                 break;
             case ANIMATION_FRAGMENT_EXIT:
-                animators.add(createSlideLeftOutAnimator(titleView));
-                animators.add(createSlideLeftOutAnimator(breadcrumbView));
-                animators.add(createSlideLeftOutAnimator(descriptionView));
-                animators.add(createSlideLeftOutAnimator(iconView));
-                animators.add(createSlideLeftOutAnimator(listView));
-                animators.add(createSlideLeftOutAnimator(selectorView));
+                animators.add(createSlideOutToStartAnimator(titleView));
+                animators.add(createSlideOutToStartAnimator(breadcrumbView));
+                animators.add(createSlideOutToStartAnimator(descriptionView));
+                animators.add(createSlideOutToStartAnimator(iconView));
+                animators.add(createSlideOutToStartAnimator(listView));
+                animators.add(createSlideOutToStartAnimator(selectorView));
                 animators.add(createFadeOutAnimator(actionContainerView));
                 break;
             case ANIMATION_FRAGMENT_ENTER_POP:
-                animators.add(createSlideRightInAnimator(titleView));
-                animators.add(createSlideRightInAnimator(breadcrumbView));
-                animators.add(createSlideRightInAnimator(descriptionView));
-                animators.add(createSlideRightInAnimator(iconView));
-                animators.add(createSlideRightInAnimator(listView));
-                animators.add(createSlideRightInAnimator(selectorView));
+                animators.add(createSlideInFromStartAnimator(titleView));
+                animators.add(createSlideInFromStartAnimator(breadcrumbView));
+                animators.add(createSlideInFromStartAnimator(descriptionView));
+                animators.add(createSlideInFromStartAnimator(iconView));
+                animators.add(createSlideInFromStartAnimator(listView));
+                animators.add(createSlideInFromStartAnimator(selectorView));
                 break;
             case ANIMATION_FRAGMENT_EXIT_POP:
-                animators.add(createSlideRightOutAnimator(titleView));
-                animators.add(createSlideRightOutAnimator(breadcrumbView));
-                animators.add(createSlideRightOutAnimator(descriptionView));
-                animators.add(createSlideRightOutAnimator(iconView));
-                animators.add(createSlideRightOutAnimator(listView));
-                animators.add(createSlideRightOutAnimator(selectorView));
+                animators.add(createSlideOutToEndAnimator(titleView));
+                animators.add(createSlideOutToEndAnimator(breadcrumbView));
+                animators.add(createSlideOutToEndAnimator(descriptionView));
+                animators.add(createSlideOutToEndAnimator(iconView));
+                animators.add(createSlideOutToEndAnimator(listView));
+                animators.add(createSlideOutToEndAnimator(selectorView));
                 animators.add(createFadeOutAnimator(actionContainerView));
                 break;
             default:
@@ -641,21 +642,27 @@
                 oa.setInterpolator(new DecelerateInterpolator(1.0f));
                 oa.start();
 
+                boolean isRtl = ViewCompat.getLayoutDirection(contentView) ==
+                        View.LAYOUT_DIRECTION_RTL;
+                int startDist = isRtl ? SLIDE_IN_DISTANCE : -SLIDE_IN_DISTANCE;
+                int endDist = isRtl ? -actionContainerView.getMeasuredWidth() :
+                        actionContainerView.getMeasuredWidth();
+
                 // Fade in and slide in the ContentFragment
-                // TextViews from the left.
+                // TextViews from the start.
                 prepareAndAnimateView((View) contentView.getTag(R.id.title),
-                        -SLIDE_IN_DISTANCE, false);
+                        startDist, false);
                 prepareAndAnimateView((View) contentView.getTag(R.id.breadcrumb),
-                        -SLIDE_IN_DISTANCE, false);
+                        startDist, false);
                 prepareAndAnimateView((View) contentView.getTag(R.id.description),
-                        -SLIDE_IN_DISTANCE, false);
+                        startDist, false);
 
                 // Fade in and slide in the ActionFragment from the
-                // right.
+                // end.
                 prepareAndAnimateView(actionContainerView,
-                        actionContainerView.getMeasuredWidth(), false);
+                        endDist, false);
                 prepareAndAnimateView((View) contentView.getTag(R.id.icon),
-                        -SLIDE_IN_DISTANCE, true);
+                        startDist, true);
 
                 // Fade in the selector.
                 if (mSelectorAnimator != null) {
@@ -698,20 +705,24 @@
         return animator;
     }
 
-    private Animator createSlideLeftOutAnimator(View v) {
-        return createTranslateAlphaAnimator(v, 0, -200f, 1f, 0);
+    private Animator createSlideOutToStartAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        return createTranslateAlphaAnimator(v, 0, isRtl ? 200f : -200f, 1f, 0);
     }
 
-    private Animator createSlideLeftInAnimator(View v) {
-        return createTranslateAlphaAnimator(v, 200f, 0, 0, 1f);
+    private Animator createSlideInFromEndAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        return createTranslateAlphaAnimator(v, isRtl ? -200f : 200f, 0, 0, 1f);
     }
 
-    private Animator createSlideRightInAnimator(View v) {
-        return createTranslateAlphaAnimator(v, -200f, 0, 0, 1f);
+    private Animator createSlideInFromStartAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        return createTranslateAlphaAnimator(v, isRtl ? 200f : -200f, 0, 0, 1f);
     }
 
-    private Animator createSlideRightOutAnimator(View v) {
-        return createTranslateAlphaAnimator(v, 0, 200f, 1f, 0);
+    private Animator createSlideOutToEndAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        return createTranslateAlphaAnimator(v, 0, isRtl ? -200f : 200f, 1f, 0);
     }
 
     private Animator createFadeOutAnimator(View v) {
diff --git a/Settings/src/com/android/tv/settings/dialog/Layout.java b/Settings/src/com/android/tv/settings/dialog/Layout.java
index f05209f..9793f88 100644
--- a/Settings/src/com/android/tv/settings/dialog/Layout.java
+++ b/Settings/src/com/android/tv/settings/dialog/Layout.java
@@ -249,6 +249,8 @@
     }
 
     public abstract static class LayoutGetter extends LayoutTreeNode {
+        // Layout manages this listener; removing it when this node is not visible and setting it
+        // when it is.  Users are expected to set the listener with Layout.setRefreshViewListener.
         private LayoutNodeRefreshListener mListener;
 
         public void setListener(LayoutNodeRefreshListener listener) {
@@ -257,7 +259,6 @@
 
         public void notVisible() {
             mListener = null;
-            onMovedOffScreen();
         }
 
         public abstract Layout get();
@@ -271,14 +272,6 @@
         }
 
         /**
-         * Notification to client that the list containting the contents of this getter is no longer
-         * visible and background tasks to update the getter contents should be stopped until the
-         * next "get()" call.
-         */
-        public void onMovedOffScreen() {
-        }
-
-        /**
          * Notification from client that antecedent data has changed and the list containing the
          * contents of this getter should be updated.
          */
@@ -485,11 +478,21 @@
                 return this;
             }
 
+             public Builder icon(int resId) {
+                 mAction.mAppearence.mIcon = mRes.getDrawable(resId);
+                 return this;
+             }
+
             public Builder description(String description) {
                 mAction.mAppearence.mDescriptionGetter = new LiteralStringGetter(description);
                 return this;
             }
 
+            public Builder description(StringGetter description) {
+                mAction.mAppearence.mDescriptionGetter = description;
+                return this;
+            }
+
             public Builder checked(boolean checked) {
                 mAction.mAppearence.mChecked = checked;
                 return this;
diff --git a/Settings/src/com/android/tv/settings/dialog/SettingsLayoutActivity.java b/Settings/src/com/android/tv/settings/dialog/SettingsLayoutActivity.java
index 2191e02..2d8f6e5 100644
--- a/Settings/src/com/android/tv/settings/dialog/SettingsLayoutActivity.java
+++ b/Settings/src/com/android/tv/settings/dialog/SettingsLayoutActivity.java
@@ -17,6 +17,7 @@
 package com.android.tv.settings.dialog;
 
 import android.app.Activity;
+import android.app.FragmentManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -24,7 +25,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Log;
 
 import com.android.tv.settings.dialog.SettingsLayoutFragment;
 import com.android.tv.settings.dialog.Layout;
@@ -42,21 +42,25 @@
         SettingsLayoutFragment.Listener, SettingsLayoutAdapter.OnFocusListener {
 
     private SettingsLayoutFragment mSettingsLayoutFragment;
-    private Layout mLayout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        mLayout = createLayout();
-        mLayout.navigateToRoot();
-        mSettingsLayoutFragment = new SettingsLayoutFragment.Builder()
-                .title(mLayout.getTitle())
-                .breadcrumb(mLayout.getBreadcrumb())
-                .icon(mLayout.getIcon())
-                .iconBackgroundColor(getResources().getColor(R.color.icon_background))
-                .layout(mLayout).build();
-        SettingsLayoutFragment.add(getFragmentManager(), mSettingsLayoutFragment);
+        final Layout layout = createLayout();
+        layout.navigateToRoot();
+        final FragmentManager fm = getFragmentManager();
+        mSettingsLayoutFragment = (SettingsLayoutFragment) fm.findFragmentByTag(
+                SettingsLayoutFragment.TAG_LEAN_BACK_DIALOG_FRAGMENT);
+        if (mSettingsLayoutFragment == null) {
+            mSettingsLayoutFragment = new SettingsLayoutFragment.Builder()
+                    .title(layout.getTitle())
+                    .breadcrumb(layout.getBreadcrumb())
+                    .icon(layout.getIcon())
+                    .iconBackgroundColor(getResources().getColor(R.color.icon_background))
+                    .build();
+            SettingsLayoutFragment.add(fm, mSettingsLayoutFragment);
+        }
+        mSettingsLayoutFragment.setLayout(layout);
     }
 
     @Override
diff --git a/Settings/src/com/android/tv/settings/dialog/SettingsLayoutFragment.java b/Settings/src/com/android/tv/settings/dialog/SettingsLayoutFragment.java
index eea5b9b..353c799 100644
--- a/Settings/src/com/android/tv/settings/dialog/SettingsLayoutFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/SettingsLayoutFragment.java
@@ -42,8 +42,8 @@
 import android.os.Parcelable;
 import android.support.v17.leanback.R;
 import android.support.v17.leanback.widget.VerticalGridView;
+import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -67,7 +67,7 @@
  */
 public class SettingsLayoutFragment extends Fragment implements Layout.LayoutNodeRefreshListener {
 
-    private static final String TAG_LEAN_BACK_DIALOG_FRAGMENT = "leanBackSettingsLayoutFragment";
+    public static final String TAG_LEAN_BACK_DIALOG_FRAGMENT = "leanBackSettingsLayoutFragment";
     private static final String EXTRA_CONTENT_TITLE = "title";
     private static final String EXTRA_CONTENT_BREADCRUMB = "breadcrumb";
     private static final String EXTRA_CONTENT_DESCRIPTION = "description";
@@ -76,7 +76,6 @@
     private static final String EXTRA_CONTENT_ICON_BITMAP = "iconBitmap";
     private static final String EXTRA_CONTENT_ICON_BACKGROUND = "iconBackground";
     private static final String EXTRA_ACTION_NAME = "name";
-    private static final String EXTRA_ACTION_LAYOUT = "layout";
     private static final String EXTRA_ACTION_SELECTED_INDEX = "selectedIndex";
     private static final String EXTRA_ENTRY_TRANSITION_PERFORMED = "entryTransitionPerformed";
     private static final int ANIMATION_FRAGMENT_ENTER = 1;
@@ -107,7 +106,6 @@
         private Uri mIconUri;
         private Bitmap mIconBitmap;
         private int mIconBackgroundColor = Color.TRANSPARENT;
-        private Layout mLayout;
         private String mName;
 
         public SettingsLayoutFragment build() {
@@ -121,8 +119,6 @@
             args.putParcelable(EXTRA_CONTENT_ICON_URI, mIconUri);
             args.putParcelable(EXTRA_CONTENT_ICON_BITMAP, mIconBitmap);
             args.putInt(EXTRA_CONTENT_ICON_BACKGROUND, mIconBackgroundColor);
-            args.putParcelable(EXTRA_ACTION_LAYOUT, mLayout);
-            mLayout.setRefreshViewListener(fragment);
             args.putString(EXTRA_ACTION_NAME, mName);
             fragment.setArguments(args);
             return fragment;
@@ -163,11 +159,6 @@
             return this;
         }
 
-        public Builder layout(Layout layout) {
-            mLayout = layout;
-            return this;
-        }
-
         public Builder name(String name) {
             mName = name;
             return this;
@@ -211,12 +202,14 @@
     private final Runnable mRefreshViewRunnable = new Runnable() {
         @Override
         public void run() {
-            mLayout.setSelectedIndex(mListView.getSelectedPosition());
-            mLayout.reloadLayoutRows();
-            mAdapter.setLayoutRows(mLayout.getLayoutRows());
-            mAdapter.setNoAnimateMode();
-            mAdapter.notifyDataSetChanged();
-            mListView.setSelectedPositionSmooth(mLayout.getSelectedIndex());
+            if (isResumed()) {
+                mLayout.setSelectedIndex(mListView.getSelectedPosition());
+                mLayout.reloadLayoutRows();
+                mAdapter.setLayoutRows(mLayout.getLayoutRows());
+                mAdapter.setNoAnimateMode();
+                mAdapter.notifyDataSetChanged();
+                mListView.setSelectedPositionSmooth(mLayout.getSelectedIndex());
+            }
         }
     };
 
@@ -242,7 +235,6 @@
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        android.util.Log.v("SettingsLayoutFragment", "onCreate");
         super.onCreate(savedInstanceState);
         Bundle state = (savedInstanceState != null) ? savedInstanceState : getArguments();
         mTitle = state.getString(EXTRA_CONTENT_TITLE);
@@ -252,7 +244,6 @@
         mIconUri = state.getParcelable(EXTRA_CONTENT_ICON_URI);
         mIconBitmap = state.getParcelable(EXTRA_CONTENT_ICON_BITMAP);
         mIconBackgroundColor = state.getInt(EXTRA_CONTENT_ICON_BACKGROUND, Color.TRANSPARENT);
-        mLayout = state.getParcelable(EXTRA_ACTION_LAYOUT);
         mName = state.getString(EXTRA_ACTION_NAME);
         mSelectedIndex = state.getInt(EXTRA_ACTION_SELECTED_INDEX, -1);
         mEntryTransitionPerformed = state.getBoolean(EXTRA_ENTRY_TRANSITION_PERFORMED, false);
@@ -296,7 +287,6 @@
         outState.putParcelable(EXTRA_CONTENT_ICON_URI, mIconUri);
         outState.putParcelable(EXTRA_CONTENT_ICON_BITMAP, mIconBitmap);
         outState.putInt(EXTRA_CONTENT_ICON_BACKGROUND, mIconBackgroundColor);
-        outState.putParcelable(EXTRA_ACTION_LAYOUT, mLayout);
         outState.putInt(EXTRA_ACTION_SELECTED_INDEX,
                 (mListView != null) ? mListView.getSelectedPosition() : -1);
         outState.putString(EXTRA_ACTION_NAME, mName);
@@ -312,6 +302,11 @@
         }
     }
 
+    public void setLayout(Layout layout) {
+        mLayout = layout;
+        mLayout.setRefreshViewListener(this);
+    }
+
     // TODO refactor to get this call as the result of a callback from the Layout.
     private void updateViews() {
         View dialogView = getView();
@@ -428,37 +423,37 @@
 
         switch (nextAnim) {
             case ANIMATION_FRAGMENT_ENTER:
-                animators.add(createSlideLeftInAnimator(titleView));
-                animators.add(createSlideLeftInAnimator(breadcrumbView));
-                animators.add(createSlideLeftInAnimator(descriptionView));
-                animators.add(createSlideLeftInAnimator(iconView));
-                animators.add(createSlideLeftInAnimator(listView));
-                animators.add(createSlideLeftInAnimator(selectorView));
+                animators.add(createSlideInFromEndAnimator(titleView));
+                animators.add(createSlideInFromEndAnimator(breadcrumbView));
+                animators.add(createSlideInFromEndAnimator(descriptionView));
+                animators.add(createSlideInFromEndAnimator(iconView));
+                animators.add(createSlideInFromEndAnimator(listView));
+                animators.add(createSlideInFromEndAnimator(selectorView));
                 break;
             case ANIMATION_FRAGMENT_EXIT:
-                animators.add(createSlideLeftOutAnimator(titleView));
-                animators.add(createSlideLeftOutAnimator(breadcrumbView));
-                animators.add(createSlideLeftOutAnimator(descriptionView));
-                animators.add(createSlideLeftOutAnimator(iconView));
-                animators.add(createSlideLeftOutAnimator(listView));
-                animators.add(createSlideLeftOutAnimator(selectorView));
+                animators.add(createSlideOutToStartAnimator(titleView));
+                animators.add(createSlideOutToStartAnimator(breadcrumbView));
+                animators.add(createSlideOutToStartAnimator(descriptionView));
+                animators.add(createSlideOutToStartAnimator(iconView));
+                animators.add(createSlideOutToStartAnimator(listView));
+                animators.add(createSlideOutToStartAnimator(selectorView));
                 animators.add(createFadeOutAnimator(actionContainerView));
                 break;
             case ANIMATION_FRAGMENT_ENTER_POP:
-                animators.add(createSlideRightInAnimator(titleView));
-                animators.add(createSlideRightInAnimator(breadcrumbView));
-                animators.add(createSlideRightInAnimator(descriptionView));
-                animators.add(createSlideRightInAnimator(iconView));
-                animators.add(createSlideRightInAnimator(listView));
-                animators.add(createSlideRightInAnimator(selectorView));
+                animators.add(createSlideInFromStartAnimator(titleView));
+                animators.add(createSlideInFromStartAnimator(breadcrumbView));
+                animators.add(createSlideInFromStartAnimator(descriptionView));
+                animators.add(createSlideInFromStartAnimator(iconView));
+                animators.add(createSlideInFromStartAnimator(listView));
+                animators.add(createSlideInFromStartAnimator(selectorView));
                 break;
             case ANIMATION_FRAGMENT_EXIT_POP:
-                animators.add(createSlideRightOutAnimator(titleView));
-                animators.add(createSlideRightOutAnimator(breadcrumbView));
-                animators.add(createSlideRightOutAnimator(descriptionView));
-                animators.add(createSlideRightOutAnimator(iconView));
-                animators.add(createSlideRightOutAnimator(listView));
-                animators.add(createSlideRightOutAnimator(selectorView));
+                animators.add(createSlideOutToEndAnimator(titleView));
+                animators.add(createSlideOutToEndAnimator(breadcrumbView));
+                animators.add(createSlideOutToEndAnimator(descriptionView));
+                animators.add(createSlideOutToEndAnimator(iconView));
+                animators.add(createSlideOutToEndAnimator(listView));
+                animators.add(createSlideOutToEndAnimator(selectorView));
                 animators.add(createFadeOutAnimator(actionContainerView));
                 break;
             default:
@@ -663,19 +658,25 @@
                             oa.setInterpolator(new DecelerateInterpolator(1.0f));
                             oa.start();
 
-                            // Fade in and slide in the ContentFragment TextViews from the left.
-                            prepareAndAnimateView((View) contentView.getTag(R.id.title),
-                                    -mSlideInDistance, false);
-                            prepareAndAnimateView((View) contentView.getTag(R.id.breadcrumb),
-                                    -mSlideInDistance, false);
-                            prepareAndAnimateView((View) contentView.getTag(R.id.description),
-                                    -mSlideInDistance, false);
+                            boolean isRtl = ViewCompat.getLayoutDirection(contentView) ==
+                                    View.LAYOUT_DIRECTION_RTL;
+                            int startDist = isRtl ? mSlideInDistance : -mSlideInDistance;
+                            int endDist = isRtl ? -actionContainerView.getMeasuredWidth() :
+                                    actionContainerView.getMeasuredWidth();
 
-                            // Fade in and slide in the ActionFragment from the right.
+                            // Fade in and slide in the ContentFragment TextViews from the start.
+                            prepareAndAnimateView((View) contentView.getTag(R.id.title),
+                                    startDist, false);
+                            prepareAndAnimateView((View) contentView.getTag(R.id.breadcrumb),
+                                    startDist, false);
+                            prepareAndAnimateView((View) contentView.getTag(R.id.description),
+                                    startDist, false);
+
+                            // Fade in and slide in the ActionFragment from the end.
                             prepareAndAnimateView(actionContainerView,
-                                    actionContainerView.getMeasuredWidth(), false);
+                                    endDist, false);
                             prepareAndAnimateView((View) contentView.getTag(R.id.icon),
-                                    -mSlideInDistance, true);
+                                    startDist, true);
                         }
                     };
                 });
@@ -714,23 +715,31 @@
         return animator;
     }
 
-    private Animator createSlideLeftOutAnimator(View v) {
-        return createTranslateAlphaAnimator(v, SLIDE_OUT_ANIMATOR_LEFT, -SLIDE_OUT_ANIMATOR_RIGHT,
-               SLIDE_OUT_ANIMATOR_END_ALPHA, SLIDE_OUT_ANIMATOR_START_ALPHA);
+    private Animator createSlideOutToStartAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        float toX = isRtl ? SLIDE_OUT_ANIMATOR_RIGHT : -SLIDE_OUT_ANIMATOR_RIGHT;
+        return createTranslateAlphaAnimator(v, SLIDE_OUT_ANIMATOR_LEFT, toX,
+                SLIDE_OUT_ANIMATOR_END_ALPHA, SLIDE_OUT_ANIMATOR_START_ALPHA);
     }
 
-    private Animator createSlideLeftInAnimator(View v) {
-        return createTranslateAlphaAnimator(v, SLIDE_OUT_ANIMATOR_RIGHT, SLIDE_OUT_ANIMATOR_LEFT,
+    private Animator createSlideInFromEndAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        float fromX = isRtl ? -SLIDE_OUT_ANIMATOR_RIGHT : SLIDE_OUT_ANIMATOR_RIGHT;
+        return createTranslateAlphaAnimator(v, fromX, SLIDE_OUT_ANIMATOR_LEFT,
                 SLIDE_OUT_ANIMATOR_START_ALPHA, SLIDE_OUT_ANIMATOR_END_ALPHA);
     }
 
-    private Animator createSlideRightInAnimator(View v) {
-        return createTranslateAlphaAnimator(v, -SLIDE_OUT_ANIMATOR_RIGHT, SLIDE_OUT_ANIMATOR_LEFT,
+    private Animator createSlideInFromStartAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        float fromX = isRtl ? SLIDE_OUT_ANIMATOR_RIGHT : -SLIDE_OUT_ANIMATOR_RIGHT;
+        return createTranslateAlphaAnimator(v, fromX, SLIDE_OUT_ANIMATOR_LEFT,
                 SLIDE_OUT_ANIMATOR_START_ALPHA, SLIDE_OUT_ANIMATOR_END_ALPHA);
     }
 
-    private Animator createSlideRightOutAnimator(View v) {
-        return createTranslateAlphaAnimator(v, SLIDE_OUT_ANIMATOR_LEFT, SLIDE_OUT_ANIMATOR_RIGHT,
+    private Animator createSlideOutToEndAnimator(View v) {
+        boolean isRtl = ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_RTL;
+        float toX = isRtl ? -SLIDE_OUT_ANIMATOR_RIGHT : SLIDE_OUT_ANIMATOR_RIGHT;
+        return createTranslateAlphaAnimator(v, SLIDE_OUT_ANIMATOR_LEFT, toX,
                 SLIDE_OUT_ANIMATOR_END_ALPHA, SLIDE_OUT_ANIMATOR_START_ALPHA);
     }
 
diff --git a/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java b/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java
index 5bc6eba..7bd5c0d 100644
--- a/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
+import android.support.v4.view.ViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
@@ -216,25 +217,31 @@
                     oa.setInterpolator(new DecelerateInterpolator(1.0f));
                     oa.start();
 
-                    // Fade in and slide in the ContentFragment TextViews from the left.
-                    prepareAndAnimateView(title, 0, - SLIDE_IN_DISTANCE,
+                    View actionFragmentView = activity.findViewById(mActionAreaId);
+                    boolean isRtl = ViewCompat.getLayoutDirection(contentView) ==
+                            View.LAYOUT_DIRECTION_RTL;
+                    int startDist = isRtl ? SLIDE_IN_DISTANCE : -SLIDE_IN_DISTANCE;
+                    int endDist = isRtl ? -actionFragmentView.getMeasuredWidth() :
+                            actionFragmentView.getMeasuredWidth();
+
+                    // Fade in and slide in the ContentFragment TextViews from the start.
+                    prepareAndAnimateView(title, 0, startDist,
                             secondaryDelay, ANIMATE_IN_DURATION,
                             new DecelerateInterpolator(1.0f),
                             false);
-                    prepareAndAnimateView(breadcrumb, 0, - SLIDE_IN_DISTANCE,
+                    prepareAndAnimateView(breadcrumb, 0, startDist,
                             secondaryDelay, ANIMATE_IN_DURATION,
                             new DecelerateInterpolator(1.0f),
                             false);
                     prepareAndAnimateView(description, 0,
-                            - SLIDE_IN_DISTANCE,
+                            startDist,
                             secondaryDelay, ANIMATE_IN_DURATION,
                             new DecelerateInterpolator(1.0f),
                             false);
 
-                    // Fade in and slide in the ActionFragment from the right.
-                    View actionFragmentView = activity.findViewById(mActionAreaId);
+                    // Fade in and slide in the ActionFragment from the end.
                     prepareAndAnimateView(actionFragmentView, 0,
-                            actionFragmentView.getMeasuredWidth(), secondaryDelay,
+                            endDist, secondaryDelay,
                             ANIMATE_IN_DURATION, new DecelerateInterpolator(1.0f),
                             false);
 
@@ -250,7 +257,7 @@
                         transitionAnimation.addTransitionTarget(target);
                         transitionAnimation.startTransition();
                     } else if (icon != null) {
-                        prepareAndAnimateView(icon, 0, - SLIDE_IN_DISTANCE,
+                        prepareAndAnimateView(icon, 0, startDist,
                                 secondaryDelay, ANIMATE_IN_DURATION,
                                 new DecelerateInterpolator(1.0f), true /* is the icon */);
                         if (mShadowLayer != null) {
diff --git a/Settings/src/com/android/tv/settings/dialog/old/TosWebViewFragment.java b/Settings/src/com/android/tv/settings/dialog/old/TosWebViewFragment.java
deleted file mode 100644
index 4d71feb..0000000
--- a/Settings/src/com/android/tv/settings/dialog/old/TosWebViewFragment.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (C) 2014 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.tv.settings.dialog.old;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Message;
-import android.provider.Settings;
-import android.provider.Settings.Secure;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.android.tv.settings.R;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.util.Locale;
-
-/**
- * Fragment that shows a link containing the ToS.
- */
-public class TosWebViewFragment extends Fragment {
-
-    private static final String TAG = "TosWebViewFragment";
-    private static final boolean DEBUG = false;
-    // TODO switch to pointing to proper TLD once there is a reliable way to
-    // map geography to proper TLD, b/11032160
-    private static final String GOOGLE_TOS_URL = "http://www.google.com/intl/%y_%z/policies/terms/";
-    private static final String GOOGLE_PRIVACY_URL =
-        "http://www.google.com/intl/%y_%z/policies/privacy/";
-
-    private static final String SETTINGS_SECURE_TOS_URL = "canvas_tos_url";
-    private static final String SETTINGS_SECURE_PRIVACY_URL = "canvas_privacy_url";
-
-    private static final int SOURCE_URL = 1;
-    private static final int SOURCE_STRING = 2;
-    private static final int SOURCE_RESOURCE_ID = 3;
-
-    private static final String ARGUMENT_SHOW = "show";
-    private static final String ARGUMENT_CONTENT_STRING = "content_string";
-    private static final String ARGUMENT_CONTENT_URL = "content_url";
-    private static final String ARGUMENT_CONTENT_RESOURCE_ID = "content_resource_id";
-
-    public static final int SHOW_TERMS_OF_SERVICE = 3;
-    public static final int SHOW_PRIVACY_POLICY = 4;
-    public static final int SHOW_ADDITIONAL_TERMS = 5;
-
-    /**
-     * Create instance and select page to display. The content is selected by the single parameter
-     * and determined by a URL or resource string depending on the page to show.
-     *
-     * @param show One of SHOW_TERMS_OF_SERVICE, SHOW_PRIVACY_POLICY, SHOW_ADDITIONAL_TERMS
-     */
-    public static TosWebViewFragment newInstance(int show) {
-        TosWebViewFragment f = new TosWebViewFragment();
-        Bundle args = new Bundle();
-        args.putInt(ARGUMENT_SHOW, show);
-        f.setArguments(args);
-        return f;
-    }
-
-    /**
-     * Create instance and display page from URL.
-     *
-     * @param uri URL of page to show.
-     */
-    public static TosWebViewFragment newInstanceUrl(String pageUrl) {
-        TosWebViewFragment f = new TosWebViewFragment();
-        Bundle args = new Bundle();
-        args.putString(ARGUMENT_CONTENT_URL, pageUrl);
-        f.setArguments(args);
-        return f;
-    }
-
-    /**
-     * Create instance and display page from a string.
-     *
-     * @param page Text to show.
-     */
-    public static TosWebViewFragment newInstance(String page) {
-        TosWebViewFragment f = new TosWebViewFragment();
-        Bundle args = new Bundle();
-        args.putString(ARGUMENT_CONTENT_STRING, page);
-        f.setArguments(args);
-        return f;
-    }
-
-    /**
-     * Create instance and display page from resource id.
-     *
-     * @param resourceId id or string resourse to show.
-     */
-    public static TosWebViewFragment newInstance_resourceId(int resourceId) {
-        TosWebViewFragment f = new TosWebViewFragment();
-        Bundle args = new Bundle();
-        args.putInt(ARGUMENT_CONTENT_RESOURCE_ID, resourceId);
-        f.setArguments(args);
-        return f;
-    }
-
-    private class MyChromeClient extends WebChromeClient {
-        @Override
-        public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture,
-                Message resultMsg) {
-            resultMsg.obj = mWebView;
-            resultMsg.sendToTarget();
-            return true;
-        }
-
-        @Override
-        public void onProgressChanged(WebView view, int newProgress) {
-        }
-
-        @Override
-        public boolean onConsoleMessage(android.webkit.ConsoleMessage consoleMessage) {
-            return true;
-        }
-    }
-
-    private class MyWebViewClient extends WebViewClient {
-
-        /**
-         * Before we load any page, we check with our session object to see if
-         * we should do any special handling at this point
-         */
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            return false;
-        }
-
-        @Override
-        public void onPageStarted(WebView view, String url, Bitmap favicon) {
-        }
-
-        @Override
-        public void onReceivedError(WebView view, int errorCode, String description,
-                String failingUrl) {
-            Log.w(TAG, String.format(
-                    "onReceivedError: errorCode %d, description: %s, url: %s", errorCode,
-                    description, failingUrl));
-            mIsLoading = false;
-            // If this is the first attempted page load, this could be a
-            // connectivity issue
-            // We treat it all as server error, let ShowError decide if network
-            // is still up
-            onWebLoginError(errorCode, description);
-            super.onReceivedError(view, errorCode, description, failingUrl);
-        }
-
-        @Override
-        public void onTooManyRedirects(WebView view, Message cancelMsg, Message continueMsg) {
-            Log.e(TAG, "onTooManyRedirects");
-            // Users probably don't care about redirects, it's a server error to
-            // them
-            onWebLoginError(0, "");
-        }
-
-        @Override
-        public void onPageFinished(WebView view, String url) {
-            if (DEBUG) {
-                Log.d(TAG, "Loaded " + url);
-            }
-            view.requestFocus();
-        }
-
-        private void onWebLoginError(int errorCode, String description) {
-            // TODO: Show error?
-        }
-    }
-
-    private WebView mWebView;
-    private String mSource;
-    private int mSourceType;
-    private boolean mIsLoading;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle icicle) {
-        View content = inflater.inflate(R.layout.navigable_webview, null);
-
-        if (icicle == null) {
-            mWebView = (WebView) content.findViewById(R.id.webview);
-            CookieSyncManager.createInstance(getActivity());
-            mWebView.setWebViewClient(new MyWebViewClient());
-            mWebView.setWebChromeClient(new MyChromeClient());
-            WebSettings s = mWebView.getSettings();
-            s.setNeedInitialFocus(true);
-            s.setJavaScriptEnabled(true);
-            s.setSupportMultipleWindows(false);
-            s.setSaveFormData(false);
-            s.setSavePassword(false);
-            s.setAllowFileAccess(false);
-            s.setDatabaseEnabled(false);
-            s.setJavaScriptCanOpenWindowsAutomatically(false);
-            s.setLoadsImagesAutomatically(true);
-            s.setLightTouchEnabled(false);
-            s.setNeedInitialFocus(false);
-            s.setUseWideViewPort(true);
-            s.setSupportZoom(false);
-            mWebView.setMapTrackballToArrowKeys(false);
-
-            int show = getArguments().getInt(ARGUMENT_SHOW, -1);
-            switch (show) {
-                case SHOW_TERMS_OF_SERVICE:
-                    mSourceType = SOURCE_URL;
-                    mSource = Settings.Secure.getString(getActivity().getContentResolver(),
-                        SETTINGS_SECURE_TOS_URL);
-                    if (mSource == null) {
-                        mSource = GOOGLE_TOS_URL;
-                    }
-                    mSource = substitueArguments(mSource);
-                    break;
-                case SHOW_PRIVACY_POLICY:
-                    mSourceType = SOURCE_URL;
-                    mSource = Settings.Secure.getString(getActivity().getContentResolver(),
-                        SETTINGS_SECURE_PRIVACY_URL);
-                    if (mSource == null) {
-                        mSource = GOOGLE_PRIVACY_URL;
-                    }
-                    mSource = substitueArguments(mSource);
-                    break;
-                case SHOW_ADDITIONAL_TERMS:
-                    mSourceType = SOURCE_STRING;
-                    mSource = readStringFromResource(getActivity(),
-                        R.raw.additional_terms_of_service);
-                    break;
-                default:
-                    // User is specifying a page to display, either by Url, resource id or string.
-                    mSource = getArguments().getString(ARGUMENT_CONTENT_URL);
-                    if (mSource != null) {
-                        mSourceType = SOURCE_URL;
-                        mSource = substitueArguments(mSource);
-                    } else {
-                        mSourceType = SOURCE_STRING;
-                        mSource = getArguments().getString(ARGUMENT_CONTENT_STRING);
-                        if (mSource == null) {
-                            int resourceId = getArguments().getInt(ARGUMENT_CONTENT_RESOURCE_ID);
-                            mSource = getResources().getString(resourceId);
-                        }
-                    }
-                    break;
-            }
-        }
-        return content;
-    }
-
-    /**
-     * Determines the current activity mode and initializes ui appropriately.
-     */
-    @Override
-    public void onResume() {
-        super.onResume();
-        mIsLoading = true;
-        switch (mSourceType) {
-            case SOURCE_URL:
-                mWebView.loadUrl(mSource);
-                break;
-            case SOURCE_STRING:
-                mWebView.loadData(mSource,"text/html", null);
-                break;
-        }
-        mWebView.onResume();
-    }
-
-    /**
-     * Stops page loading if it is in progress.
-     */
-    @Override
-    public void onPause() {
-        if (mIsLoading) {
-            mWebView.stopLoading();
-            mIsLoading = false;
-        }
-        mWebView.onPause();
-        super.onPause();
-    }
-
-    private String substitueArguments(String url) {
-        // Substitute locale if present in property
-        if (url.contains("%m")) {
-            try {
-                Configuration config = new Configuration();
-                Settings.System.getConfiguration(getActivity().getContentResolver(), config);
-                if (config.mcc != 0) {
-                    url = url.replace("%m", Integer.toString(config.mcc));
-                } else {
-                    // This will happen if the device doesn't have a SIM, in
-                    // which case we just use the locale.
-                    url = url.replace("%m", "%s");
-                }
-            } catch (Exception e) {
-                // Intentionally left blank
-            }
-        }
-        if (url.contains("%s")) {
-            Locale locale = Locale.getDefault();
-            String tmp = locale.getLanguage() + "_" + locale.getCountry().toLowerCase();
-            url = url.replace("%s", tmp);
-        }
-
-        // %y is used to indicate a language variable to be replaced at runtime.
-        if (url.contains("%y")) {
-            Locale locale = Locale.getDefault();
-            url = url.replace("%y", locale.getLanguage());
-        }
-
-        // %z is used to indicate the country. We use the value set by the
-        // SIM. We choose not to use the operator/network country but that
-        // which is set on SIM as they most likely procured the device there
-        if (url.contains("%z")) {
-            try {
-                TelephonyManager telephony = (TelephonyManager) getActivity()
-                        .getSystemService(Context.TELEPHONY_SERVICE);
-
-                Configuration config = new Configuration();
-                Settings.System.getConfiguration(getActivity().getContentResolver(), config);
-
-                if (telephony != null && config.mcc != 0) {
-                    String simCountryIso = telephony.getSimCountryIso();
-                    if (TextUtils.isEmpty(simCountryIso)) {
-                        simCountryIso = "us";
-                    }
-                    url = url.replace("%z", simCountryIso);
-                } else {
-                    // This will happen if the device doesn't have a SIM, in
-                    // which case we just use the country with the default
-                    // locale country
-                    Locale locale = Locale.getDefault();
-                    url = url.replace("%z", locale.getCountry().toLowerCase());
-                }
-            } catch (Exception e) {
-                // Intentionally left blank
-            }
-        }
-        return url;
-    }
-
-    private String readStringFromResource(Context context, int resourceId) {
-        StringBuilder contents = new StringBuilder();
-        String sep = System.lineSeparator();
-        try {
-            InputStream is = context.getResources().openRawResource(resourceId);
-            BufferedReader input = new BufferedReader(new InputStreamReader(is), 1024*8);
-            try {
-                String line = null;
-                while ((line = input.readLine()) != null) {
-                    contents.append(line);
-                    contents.append(sep);
-                }
-            } finally {
-                input.close();
-            }
-        } catch (FileNotFoundException ex) {
-            Log.e(TAG, "Couldn't find the file " + resourceId  + " " + ex);
-            return null;
-        } catch (IOException ex){
-            Log.e(TAG, "Error reading file " + resourceId + " " + ex);
-            return null;
-        }
-        return contents.toString();
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java b/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java
index 82edf0b..12f06dd 100644
--- a/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java
+++ b/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java
@@ -128,9 +128,11 @@
             case ACCESSIBILITY_OVERVIEW:
                 mActions.add(ActionType.ACCESSIBILITY_CAPTIONS.toAction(mResources));
                 mActions.add(ActionType.ACCESSIBILITY_SERVICES.toAction(mResources));
-                mActions.add(ActionType.ACCESSIBILITY_SPEAK_PASSWORDS.toAction(mResources,
-                        mHelper.getSecureStatusIntSetting(
-                                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD)));
+                // TODO b/18007521
+                // uncomment when Talkback is able to support not speaking passwords aloud
+                //mActions.add(ActionType.ACCESSIBILITY_SPEAK_PASSWORDS.toAction(mResources,
+                //        mHelper.getSecureStatusIntSetting(
+                //                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD)));
                 mActions.add(ActionType.ACCESSIBILITY_TTS_OUTPUT.toAction(mResources,
                                 getDisplayNameForEngine(mTts.getCurrentEngine())));
                 break;
diff --git a/Settings/src/com/android/tv/settings/system/ActionType.java b/Settings/src/com/android/tv/settings/system/ActionType.java
index ece713a..1baa656 100644
--- a/Settings/src/com/android/tv/settings/system/ActionType.java
+++ b/Settings/src/com/android/tv/settings/system/ActionType.java
@@ -41,7 +41,6 @@
     DATE(R.string.system_date),
     TIME(R.string.system_time),
     DATE_SET_DATE(R.string.system_set_date),
-    DATE_CHOOSE_FORMAT(R.string.system_choose_date_format),
     TIME_SET_TIME(R.string.system_set_time),
     TIME_SET_TIME_ZONE(R.string.system_set_time_zone),
     TIME_CHOOSE_FORMAT(R.string.system_set_time_format),
diff --git a/Settings/src/com/android/tv/settings/system/DateTimeActivity.java b/Settings/src/com/android/tv/settings/system/DateTimeActivity.java
index 380166e..6b914f0 100644
--- a/Settings/src/com/android/tv/settings/system/DateTimeActivity.java
+++ b/Settings/src/com/android/tv/settings/system/DateTimeActivity.java
@@ -43,9 +43,7 @@
 import android.provider.Settings.SettingNotFoundException;
 import android.text.format.DateFormat;
 import android.util.Log;
-import android.view.View;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -164,36 +162,10 @@
         }
     }
 
-    private String[] getFormattedDates() {
-        String[] dateFormats = getResources().getStringArray(R.array.date_format_values);
-        String[] formattedDates = new String[dateFormats.length];
-
-        for (int i = 0; i < formattedDates.length; i++) {
-            String formatted = DateFormat.getDateFormatForSetting(this, dateFormats[i])
-                    .format(mDummyDate.getTime());
-
-            if (dateFormats[i].length() == 0) {
-                formattedDates[i] = getString(R.string.normal_date_format, formatted);
-            } else {
-                formattedDates[i] = formatted;
-            }
-        }
-        return formattedDates;
-    }
-
     private boolean isTimeFormat24h() {
         return DateFormat.is24HourFormat(this);
     }
 
-    private String getDateFormat() {
-        return Settings.System.getString(getContentResolver(),
-                Settings.System.DATE_FORMAT);
-    }
-
-    private void setDateFormat(String s) {
-        Settings.System.putString(getContentResolver(), Settings.System.DATE_FORMAT, s);
-    }
-
     private void setTime24Hour(boolean is24Hour) {
         Settings.System.putString(getContentResolver(),
                 Settings.System.TIME_12_24,
@@ -238,11 +210,6 @@
          */
         final String key = action.getKey();
         switch ((ActionType) mState) {
-            case DATE_CHOOSE_FORMAT:
-                setDateFormat(key);
-                updateTimeAndDateStrings();
-                goBack();
-                return;
             case TIME_SET_TIME_ZONE:
                 setTimeZone(key);
                 updateTimeAndDateStrings();
@@ -264,7 +231,6 @@
         switch (type) {
             case DATE:
             case TIME:
-            case DATE_CHOOSE_FORMAT:
             case TIME_CHOOSE_FORMAT:
             case DATE_SET_DATE:
             case TIME_SET_TIME:
@@ -302,22 +268,6 @@
         return ActionType.DATE_TIME_OVERVIEW;
     }
 
-    private String getDateFormatExampleString() {
-        // Display a default example date.
-        // TODO: Check with UX on exactly what we should display here, a sample date
-        // or a standard (but localized) format descriptor.
-        String setFormat = getDateFormat();
-        String formatted = DateFormat.getDateFormatForSetting(this, getDateFormat())
-                .format(mDummyDate.getTime());
-        String displayText;
-        if (setFormat == null || setFormat.isEmpty()) {
-            displayText = getString(R.string.normal_date_format, formatted);
-        } else {
-            displayText = formatted;
-        }
-        return displayText;
-    }
-
     // Updates the Date and Time entries in the current view, without resetting the
     // Action fragment, so we don't trigger an animation.
     protected void updateTimeAndDateDisplay() {
@@ -339,8 +289,6 @@
                         break;
                     case DATE:
                         mActions.add(ActionType.DATE_SET_DATE.toAction(mResources, mNowDate));
-                        mActions.add(ActionType.DATE_CHOOSE_FORMAT.toAction(mResources,
-                                getDateFormatExampleString()));
                         break;
                     case TIME:
                         mActions.add(ActionType.TIME_SET_TIME.toAction(mResources, mNowTime));
@@ -372,9 +320,6 @@
                 break;
             case DATE:
                 mActions.add(ActionType.DATE_SET_DATE.toAction(mResources, mNowDate, !autoTime));
-
-                mActions.add(ActionType.DATE_CHOOSE_FORMAT.toAction(mResources,
-                        getDateFormatExampleString()));
                 break;
             case TIME:
                 mActions.add(ActionType.TIME_SET_TIME.toAction(mResources, mNowTime, !autoTime));
@@ -383,14 +328,6 @@
                 mActions.add(ActionType.TIME_CHOOSE_FORMAT.toAction(
                         mResources, getTimeFormatDescription()));
                 break;
-            case DATE_CHOOSE_FORMAT:
-                String[] formats = mResources.getStringArray(R.array.date_format_values);
-                String currentFormat = getDateFormat();
-                mActions = Action.createActionsFromArrays(formats, getFormattedDates());
-                for (Action action : mActions) {
-                    action.setChecked(action.getKey().equalsIgnoreCase(currentFormat));
-                }
-                break;
             case TIME_CHOOSE_FORMAT:
                 mActions.add(ActionBehavior.ON.toAction(ActionBehavior.getOnKey(
                         ActionType.TIME_CHOOSE_FORMAT.name()), mResources, isTimeFormat24h()));
diff --git a/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java b/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java
index 5b06291..fc39f32 100644
--- a/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java
+++ b/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java
@@ -50,7 +50,6 @@
 
 import com.android.internal.widget.ILockSettings;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternUtilsCache;
 import com.android.tv.dialog.PinDialogFragment;
 
 import java.util.ArrayList;
@@ -375,8 +374,8 @@
 
     private ILockSettings getLockSettings() {
         if (mLockSettingsService == null) {
-            mLockSettingsService = LockPatternUtilsCache.getInstance(
-                    ILockSettings.Stub.asInterface(ServiceManager.getService("lock_settings")));
+            mLockSettingsService = ILockSettings.Stub.asInterface(
+                    ServiceManager.getService("lock_settings"));
         }
         return mLockSettingsService;
     }
diff --git a/Settings/src/com/android/tv/settings/util/ThemeHelper.java b/Settings/src/com/android/tv/settings/util/ThemeHelper.java
index 083492c..0223f61 100644
--- a/Settings/src/com/android/tv/settings/util/ThemeHelper.java
+++ b/Settings/src/com/android/tv/settings/util/ThemeHelper.java
@@ -42,7 +42,7 @@
      */
     public static int getThemeResource(boolean transparent) {
         if (transparent) {
-            return android.R.style.Theme_Leanback_FormWizard;
+            return R.style.Theme_Leanback_FormWizard_Transparent;
         } else {
             return R.style.Theme_Leanback_FormWizard_Solid;
         }
diff --git a/Settings/src/com/android/tv/settings/widget/ResizingTextView.java b/Settings/src/com/android/tv/settings/widget/ResizingTextView.java
new file mode 100644
index 0000000..c37d085
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/widget/ResizingTextView.java
@@ -0,0 +1,88 @@
+package com.android.tv.settings.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.Layout;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.widget.TextView;
+
+import java.text.BreakIterator;
+
+import com.android.tv.settings.R;
+
+/**
+ * <p>A {@link android.widget.TextView} that changes the font size depending on the text width.</p>
+ *
+ * <p>We check for two signals that indicates that the text view is too small for the given text:
+ * 1. whether there is an ellipsis, and 2. whether a word spans two lines.  If either of these
+ * conditions are met, we move down to a smaller font size.  If the text is still too big after
+ * resizing, we give up.</p>
+ *
+ * <p>This method is not completely fool-proof because the string tokenizing method used by
+ * StaticLayout is not the same as we use here.  So some things (e.g. email addresses) might be
+ * wrapped without shrinking.</p>
+ */
+public class ResizingTextView extends TextView {
+
+    public ResizingTextView(Context ctx, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(ctx, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ResizingTextView(Context ctx, AttributeSet attrs, int defStyleAttr) {
+        super(ctx, attrs, defStyleAttr);
+    }
+
+    public ResizingTextView(Context ctx, AttributeSet attrs) {
+        super(ctx, attrs);
+    }
+
+    public ResizingTextView(Context ctx) {
+        super(ctx);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        boolean switchToSmallFont = false;
+
+        final Layout layout = getLayout();
+        if (layout != null) {
+            final int lineCount = layout.getLineCount();
+            if (lineCount > 0) {
+                final int ellipsisCount = layout.getEllipsisCount(lineCount - 1);
+                if (ellipsisCount > 0) {
+                    // Always just go to small font if we have to ellipsize.
+                    switchToSmallFont = true;
+                } else {
+                    // No ellipsis, but we could have words that span lines.
+                    BreakIterator iter = BreakIterator.getWordInstance();
+                    iter.setText(getText().toString());
+                    int breakIndex = iter.next();
+                    for (int line = 0; line < layout.getLineCount() - 1; line++) {
+                        iter.following(layout.getLineStart(line));
+                        if (breakIndex > layout.getLineVisibleEnd(line)) {
+                            // Line breaks before a word boundary.
+                            switchToSmallFont = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (switchToSmallFont) {
+            final int normalSizePx = mContext.getResources().getDimensionPixelSize(
+                    R.dimen.browse_item_title_font_size);
+            final int smallSizePx = mContext.getResources().getDimensionPixelSize(
+                    R.dimen.browse_item_title_font_size_small);
+
+            // In addition to setting the text size, we fudge the line spacing and padding so it
+            // doesn't look so strange next to non-resized text.
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, smallSizePx);
+            setLineSpacing(normalSizePx - smallSizePx, 1.0f);
+            setPaddingRelative(0, 0, 0, (normalSizePx - smallSizePx) / 2);
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/widget/picker/DatePicker.java b/Settings/src/com/android/tv/settings/widget/picker/DatePicker.java
index ecc476a..250a119 100644
--- a/Settings/src/com/android/tv/settings/widget/picker/DatePicker.java
+++ b/Settings/src/com/android/tv/settings/widget/picker/DatePicker.java
@@ -105,7 +105,7 @@
     private void initYearsArray(int startYear, int yearRange) {
         mYears = new String[yearRange];
         for (int i = 0; i < yearRange; i++) {
-            mYears[i] = String.valueOf(startYear + i);
+            mYears[i] = String.format("%d", startYear + i);
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/widget/picker/TimePicker.java b/Settings/src/com/android/tv/settings/widget/picker/TimePicker.java
index 3b38a6d..fa9bae6 100644
--- a/Settings/src/com/android/tv/settings/widget/picker/TimePicker.java
+++ b/Settings/src/com/android/tv/settings/widget/picker/TimePicker.java
@@ -17,9 +17,13 @@
 package com.android.tv.settings.widget.picker;
 
 import android.os.Bundle;
+import android.text.format.DateFormat;
+import android.text.TextUtils;
+import android.view.View;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Locale;
 
 
 public class TimePicker extends Picker {
@@ -27,10 +31,6 @@
     private static final String EXTRA_24H_FORMAT = "24h_format";
     private static final String EXTRA_DEFAULT_TO_CURRENT = "delault_to_current";
 
-    private static final int COL_HOUR = 0;
-    private static final int COL_MINUTE = 1;
-    private static final int COL_AMPM = 2;
-
     private static final int HOURS_IN_HALF_DAY = 12;
 
     private boolean mIs24hFormat = false;
@@ -39,6 +39,14 @@
     private int mInitMinute;
     private boolean mInitIsPm;
 
+    // Column order varies by locale
+    private static class ColumnOrder {
+        int mHours = 0;
+        int mMinutes = 1;
+        int mAmPm = 2;
+    }
+    private ColumnOrder mColumnOrder = new ColumnOrder();
+
     public static TimePicker newInstance() {
         return newInstance(true, true);
     }
@@ -82,6 +90,23 @@
 
             mInitMinute = cal.get(Calendar.MINUTE);
         }
+
+        Locale locale = Locale.getDefault();
+        String hmaPattern = DateFormat.getBestDateTimePattern(locale, "hma");
+        boolean isAmPmAtEnd = hmaPattern.indexOf("a") > hmaPattern.indexOf("m");
+        boolean isRtl = TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_RTL;
+        // Note ordering of calculation below is important
+        if (isRtl) {
+            // Hours and minutes are always shown with hours on the left
+            mColumnOrder.mHours = 1;
+            mColumnOrder.mMinutes = 0;
+        }
+        if (!isAmPmAtEnd && !mIs24hFormat) {
+            // Rotate AM/PM indicator to front, if visible
+            mColumnOrder.mAmPm = 0;
+            mColumnOrder.mHours++;
+            mColumnOrder.mMinutes++;
+        }
     }
 
     @Override
@@ -108,10 +133,10 @@
             }
         }
 
-        updateSelection(COL_HOUR, mIs24hFormat ? hour : (hour - 1));
-        updateSelection(COL_MINUTE, minute);
+        updateSelection(mColumnOrder.mHours, mIs24hFormat ? hour : (hour - 1));
+        updateSelection(mColumnOrder.mMinutes, minute);
         if (!mIs24hFormat) {
-            updateSelection(COL_AMPM, isPm ? 1 : 0);
+            updateSelection(mColumnOrder.mAmPm, isPm ? 1 : 0);
         }
 
         return true;
@@ -120,14 +145,19 @@
     @Override
     protected ArrayList<PickerColumn> getColumns() {
         ArrayList<PickerColumn> ret = new ArrayList<PickerColumn>();
+        // Fill output with nulls, then place actual columns according to order
+        int capacity = mIs24hFormat ? 2 : 3;
+        for (int i = 0; i < capacity; i++) {
+            ret.add(null);
+        }
         PickerColumn hours = new PickerColumn(mIs24hFormat ? mConstant.hours24 : mConstant.hours12);
         PickerColumn minutes = new PickerColumn(mConstant.minutes);
-        ret.add(hours);
-        ret.add(minutes);
+        ret.set(mColumnOrder.mHours, hours);
+        ret.set(mColumnOrder.mMinutes, minutes);
 
         if (!mIs24hFormat) {
             PickerColumn ampm = new PickerColumn(mConstant.ampm);
-            ret.add(ampm);
+            ret.set(mColumnOrder.mAmPm, ampm);
         }
         return ret;
     }