diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d8d1736..674dfc9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2428,9 +2428,9 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".sim.SimBootReceiver">
+        <receiver android:name=".sim.SimSelectNotification">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+                <action android:name="android.intent.action.SIM_STATE_CHANGED"></action>
             </intent-filter>
         </receiver>
 
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index 0bc4109..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index 72ae32f..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 2259d3d..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 356f2fa..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 4f69b27..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_light.png b/res/drawable-hdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index 99c4932..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 217b7ff..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index a992720..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index 8789d64..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index a8dcaaf..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index df55614..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index f18211a..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index ee212bc..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 8ab15d9..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 60a9833..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_light.png b/res/drawable-mdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index c9f97e9..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 1f80018..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 2b1ed62..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index ecbe438..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index 4832197..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index b4bf667..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index 0328b63..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 5a64d46..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 5ce95e5..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 91bbbc2..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_light.png b/res/drawable-xhdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index c7cd1ee..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index a3c1ce4..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 0c0a3d0..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index 0ac41ce..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index 58cf07a..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index 22e7f0f..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index 526bd28..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 97a01f7..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 7c34d42..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 60e39ff..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_light.png b/res/drawable-xxhdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index 678d3c4..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 698cee0..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 9ae3c7c..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index 6b8ef69..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index b9d0cf2..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png
index e1e0a11..b9ab604 100644
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index b9ab604..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index f31dedf..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 8176741..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 0c4741e..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 68b0cb5..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index 2e67439..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 1b2b597..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 8474c53..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index eb41081..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index 62796af..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/setup_ic_add_another_network.xml b/res/drawable/setup_ic_add_another_network.xml
new file mode 100644
index 0000000..fd716d1
--- /dev/null
+++ b/res/drawable/setup_ic_add_another_network.xml
@@ -0,0 +1,30 @@
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="25.0dp"
+        android:height="32.0dp"
+        android:viewportWidth="38.0"
+        android:viewportHeight="48.0">
+
+    <group android:translateX="5.0" android:translateY="10.0">
+
+        <path
+            android:fillColor="?android:attr/colorControlNormal"
+            android:pathData="M28.0,16.0L16.0,16.0l0.0,12.0l-4.0,0.0L12.0,16.0L0.0,16.0l0.0,-4.0l12.0,0.0L12.0,0.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z"/>
+
+    </group>
+
+</vector>
diff --git a/res/drawable/wifi_signal_light.xml b/res/drawable/wifi_signal_light.xml
deleted file mode 100644
index f1f74e3..0000000
--- a/res/drawable/wifi_signal_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_light" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_light" />
-</selector>
-
diff --git a/res/drawable/wifi_signal_lock_light.xml b/res/drawable/wifi_signal_lock_light.xml
deleted file mode 100644
index bf2d360..0000000
--- a/res/drawable/wifi_signal_lock_light.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_light" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_light" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_light" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_light" />
-</level-list>
-
diff --git a/res/drawable/wifi_signal_open_light.xml b/res/drawable/wifi_signal_open_light.xml
deleted file mode 100644
index c54e9e9..0000000
--- a/res/drawable/wifi_signal_open_light.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_light" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_light" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_light" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_light" />
-</level-list>
-
diff --git a/res/layout/network_reset_disallowed_screen.xml b/res/layout/network_reset_disallowed_screen.xml
new file mode 100644
index 0000000..04f6fc2
--- /dev/null
+++ b/res/layout/network_reset_disallowed_screen.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/listContainer"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+        <ListView android:id="@android:id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:drawSelectorOnTop="false"
+                android:scrollbarStyle="insideOverlay"
+                android:background="@android:color/white"
+                android:cacheColorHint="@android:color/white"
+                android:fadingEdgeLength="16dip" />
+
+        <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="@string/network_reset_not_available"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+</FrameLayout>
diff --git a/res/layout/setup_wifi_add_network.xml b/res/layout/setup_wifi_add_network.xml
index c62f983..23577c5 100644
--- a/res/layout/setup_wifi_add_network.xml
+++ b/res/layout/setup_wifi_add_network.xml
@@ -20,13 +20,28 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/setup_add_network_item_height"
     android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+
+    <LinearLayout
+        android:layout_width="@dimen/setup_preference_icon_frame_width"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/setup_preference_icon_frame_margin_start"
+        android:gravity="start|center_vertical"
+        android:paddingEnd="@dimen/setup_preference_icon_frame_padding_end">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/setup_ic_add_another_network" />
+
+    </LinearLayout>
 
     <TextView
-        style="@style/SetupAddWifiNetwork"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/wifi_other_network" />
+        android:layout_height="wrap_content"
+        android:text="@string/wifi_other_network"
+        android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
 
 </LinearLayout>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ecfb0f4..4419553 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2751,16 +2751,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Apusovellukset auttavat sinua löytämään ja käyttämään hyödyllisiä tietoja ilman, että sinun täytyy erikseen pyytää sitä. Jotkin sovellukset tukevat myös käynnistysohjelma- ja äänisyötepalveluja, joten ne voivat tarjota sinulle integroitua apua."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Keskimääräinen muistin käyttö"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Muistin enimmäiskäyttö"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Muistin käyttötiedot"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Sovellusten käyttötiedot"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Tietoja"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"Muistia käytetty keskimäärin <xliff:g id="SIZE">%1$s</xliff:g> viimeisen 3 tunnin aikana."</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"Muistia ei ole käytetty viimeisen 3 tunnin aikana."</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Järjestä keskivertokäytön mukaan"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Järjestä enimmäiskäytön mukaan"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Tehokkuus"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9efd354..72f5cc1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2783,16 +2783,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"אפליקציות סיוע עוזרות לך לזהות מידע שימושי ולפעול לפיו בלי לבקש אישור. אפליקציות מסוימות תומכות בשירותי מפעיל אפליקציות ובקלט קולי כדי לספק סיוע משולב."</string>
     <string name="average_memory_use" msgid="829566450150198512">"שימוש ממוצע בזיכרון"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"שימוש מקסימלי בזיכרון"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"שימוש בזיכרון"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"שימוש על ידי אפליקציות"</string>
+    <string name="memory_details" msgid="5943436005716991782">"פרטים"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"בשלוש השעות האחרונות נעשה בממוצע שימוש ב-<xliff:g id="SIZE">%1$s</xliff:g> מהזיכרון"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"לא נעשה שימוש בזיכרון בשלוש השעות האחרונות"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"מיין לפי שימוש ממוצע"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"מיין לפי שימוש מקסימלי"</string>
     <string name="memory_performance" msgid="5661005192284103281">"ביצועים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c4b9eab..dbe83bb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2757,16 +2757,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"アシストアプリを使用することにより、質問することなく、有益な情報を識別し、それに基づいて操作できるようになります。一部のアプリはランチャーと音声入力サービスの両方に対応しており、統合されたアシスタントを提供します。"</string>
     <string name="average_memory_use" msgid="829566450150198512">"平均メモリ使用"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"最大メモリ使用"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"メモリ使用量"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"アプリの使用状況"</string>
+    <string name="memory_details" msgid="5943436005716991782">"詳細"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"過去3時間の平均メモリ使用量: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"過去3時間の平均メモリ使用量: なし"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"平均使用で並べ替え"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"最大使用で並べ替え"</string>
     <string name="memory_performance" msgid="5661005192284103281">"パフォーマンス"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 68b7333..0a6957e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2751,16 +2751,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"დამხმარე აპები გეხმარებათ სასარგებლო ინფორმაციის იდენტიფიცირებასა და გამოყენებაში თხოვნის გარეშე. ზოგიერთ აპს აქვს ორივე: გამშვების და ხმოვანი შეყვანის სერვისების მხარდაჭერა ინტეგრირებული დახმარების შემოსათავაზებლად."</string>
     <string name="average_memory_use" msgid="829566450150198512">"მეხსიერების საშუალო გამოყენება"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"მეხსიერების მაქს. გამოყენება"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"მეხსიერების გამოყენება"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"აპის გამოყენება"</string>
+    <string name="memory_details" msgid="5943436005716991782">"დეტალები"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"საშუალოდ <xliff:g id="SIZE">%1$s</xliff:g> მეხსიერების გამოყენება მოხდა ბოლო 3 საათში"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"მეხსიერება არ გამოყენებულა ბოლო 3 საათში"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"საშ. გამოყენების მიხედვით დალაგება"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"მაქს. გამოყენების მიხედვით დალაგება"</string>
     <string name="memory_performance" msgid="5661005192284103281">"ეფექტურობა"</string>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index d3e1216..b1b4e90 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -248,7 +248,7 @@
     <item msgid="4498124044785815005">"Жүйені өзі шешсін"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"Аймақ"</item>
+    <item msgid="6358963769537892925">"Орын"</item>
     <item msgid="255608127647030286">"Жеке мағлұмат"</item>
     <item msgid="4588829735729884491">"Хабар алмасу"</item>
     <item msgid="886742181977884584">"Meдиа"</item>
@@ -307,19 +307,19 @@
     <item msgid="1069023208100114540">"көмекші скриншот"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"Аймақ"</item>
-    <item msgid="8677040780775113033">"Аймақ"</item>
-    <item msgid="1660743989948992916">"Аймақ"</item>
-    <item msgid="8791172739860195290">"Тербеліс"</item>
+    <item msgid="6602854600289714121">"Орын"</item>
+    <item msgid="8677040780775113033">"Орын"</item>
+    <item msgid="1660743989948992916">"Орын"</item>
+    <item msgid="8791172739860195290">"Діріл"</item>
     <item msgid="383413555642128046">"Контактілерді оқу"</item>
     <item msgid="3654594895269697313">"Контактілерді жөндеу"</item>
     <item msgid="7928393476362362538">"Қоңыраулар тіркелімін оқу"</item>
     <item msgid="6248591205254641116">"Қоңыраулар тіркелімін өзгерту"</item>
     <item msgid="6093344633066170692">"Күнтізбені оқу"</item>
     <item msgid="1334886368750347692">"Күнтізбені жөндеу"</item>
-    <item msgid="1638204101698708656">"Аймақ"</item>
+    <item msgid="1638204101698708656">"Орын"</item>
     <item msgid="2154671955760380322">"Пост хабарлары"</item>
-    <item msgid="4282477730595931828">"Аймақ"</item>
+    <item msgid="4282477730595931828">"Орын"</item>
     <item msgid="4891423912898525905">"Қоңырау шалу"</item>
     <item msgid="2623604824935968113">"SMS/MMS оқу"</item>
     <item msgid="4420177125221176306">"SMS/MMS жазу"</item>
@@ -348,8 +348,8 @@
     <item msgid="9103719301075748925">"Хабар дыбысының қаттылығы"</item>
     <item msgid="7025966722295861512">"Bluetooth дыбысының қаттылығы"</item>
     <item msgid="4665183401128289653">"Ұйқы бермеу"</item>
-    <item msgid="8584357129746649222">"Аймақ"</item>
-    <item msgid="7669257279311110599">"Аймақ"</item>
+    <item msgid="8584357129746649222">"Орын"</item>
+    <item msgid="7669257279311110599">"Орын"</item>
     <item msgid="3459320345690097795">"Пайдалану статистикасын алу"</item>
     <item msgid="1312534577834048535">"Микрофон дыбысын өшіру/қосу"</item>
     <item msgid="5906017727368097853">"Жоба тасушысы"</item>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f21c802..464c0ea 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -332,7 +332,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Бекіту экранында профайл ақпаратын көрсету"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Профайл ақпары"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"Аймақ"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Қауіпсіздік"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
@@ -1078,7 +1078,7 @@
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB жадын өшіру"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картасын өшіру"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ішкі USB жадындағы музыка немесе фотолар сияқты барлық деректерді өшіру"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD картадағы музыка және фотосуреттер сияқты деректер өшіріледі."</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD картадағы музыка және фотосуреттер сияқты барлық деректерді өшіру"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Планшетті қайта реттеу"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонды қайта реттеу"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларыңыз өшірілсін бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
@@ -1148,17 +1148,17 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жоғары дәлдік"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарея үнемдеу"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Құрал ғана"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Аймақ өшірулі"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Құрылғы ғана"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Орын өшірулі"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Соңғы аймақ өтініштері"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Жуықта ешқандай қолданба аймақ туралы өтініш жасамаған"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Аймақ қызметтері"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"Орын қызметтері"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Жоғары деңгейде батарея қолдану"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Төмен деңгейде батарея қолдану"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Аймақ режимі"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Батарея шығыны аз"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"Орын режимі"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Орынды анықтау үшін GPS, Wi‑Fi және ұялы желілерді пайдалану"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Орынды анықтау үшін Wi‑Fi және ұялы желілерді пайдалану"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдаланыңыз"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдалану"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Тексеруде"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Тексеруде"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi іздеу"</string>
@@ -1167,18 +1167,18 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Тіпті Bluetooth өшірулі кезде де, жүйелік қызметтерut Bluetooth құрылғыларын іздеуге рұқсат беру арқылы орналасуды жақсартыңыз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi және ұялы желі арқылы орынды анықтау"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Аймағыңызды жылдамырақ анықтау үшін қолданбаларға Google\' аймақтар қызметін қолдануға рұқсат етіңіз. Аймақ туралы деректер анонимді түрде жинақталып, Google-ға жіберіледі."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Аймақ Wi‑Fi арқылы анықталды"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Орын Wi‑Fi арқылы анықталды"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS серіктері"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Қолданбаларға аймақты нақты анықтау үшін планшеттегі GPS функциясын қолдануға рұқсат беру"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Қолданбаларға аймақты нақты анықтау үшін телефондағы GPS функциясын қолдануға рұқсат беру"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Көмекшісі бар GPS қолдану"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS көмекшісі ретінде сервер қолдану (желі қолдануды азайту үшін құсбелгіні алу)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS көмекшісі ретінде сервер қолдану (GPS жұмысын жақсарту үшін құсбелгіні алыңыз)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"Аймақ және Google іздеу"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Орын және Google іздеу"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Іздеу нәтижелерін және басқа қызметтерді жақсарту үшін Google қызметіне аймағыңызды қолдануға рұқсат беріңіз."</string>
     <string name="location_access_title" msgid="7064108942964081243">"Аймағыма кіру"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Рұқсат сұраған қолданбаларға аймағыңыз туралы ақпаратты қолдану мүмкіндігін беру"</string>
-    <string name="location_sources_heading" msgid="1278732419851088319">"Аймақ дереккөздері"</string>
+    <string name="location_sources_heading" msgid="1278732419851088319">"Орын дереккөздері"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Планшет туралы"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Телефон туралы"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Заңнамалық ақпарат, күйін, бағдарлама нұсқасын қарау"</string>
@@ -1295,7 +1295,7 @@
     <string name="reset_app_preferences" msgid="1321050641018356925">"Қолданба реттеулерін ысыру"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Қолданба реттеулері ысырылсын ба?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Төмендегілерге қатысты реттеулер ысырылады: \n\n "<li>"Өшірілген қолданбалар"</li>\n" "<li>"Өшірілген қолданба хабарлары"</li>\n" "<li>"Әрекеттерге арналған әдепкі қолданбалар"</li>\n" "<li>"Қолданбалар туралы жалпы мәліметті шектеу"</li>\n" "<li>"Қандай да рұқсат шектеулері"</li>\n\n" Қолданба деректері жоғалмайды."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Қолданбаларды қайта реттеу"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Қолданба реттеулерін ысыру"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кеңістікті басқару"</string>
     <string name="filter" msgid="2018011724373033887">"Сүзгі"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Сүзгі опцияларын таңдау"</string>
@@ -1321,7 +1321,7 @@
     <string name="clear_data_failed" msgid="7214074331627422248">"Қолданба деректерін өшіру мүмкін болмады."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Жаңартулар өшірілсін бе?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Осы Android жүйесіндегі барлық жаңартулар алынады."</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Дерекқорды өшіру"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Деректерді өшіру"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Қолданба дерекқорын тазарту мүмкін болмады."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Бұл қолданбаның планшеттегі келесі нәрселерге қол жетімділігі бар:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Бұл қолданбаның телефондағы келесі нәрселерге қол жетімділігі бар:"</string>
@@ -1431,7 +1431,7 @@
     <string name="pointer_settings_category" msgid="8183819795164034286">"Тінтуір/сенсорлы тақта"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Меңзер жылдамдығы"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Ойын бақылаушы"</string>
-    <string name="vibrate_input_devices" msgid="2599591466928793082">"Тербеліс қолдану"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Діріл қолдану"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Қосылғанда, тербегішті ойын бақылаушыға қайта бағыттау."</string>
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Пернетақтаның орналасу ретін таңдау"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Пернетақтаның орналасуын реттеу"</string>
@@ -1609,7 +1609,7 @@
     <string name="captioning_edge_color" msgid="3670094753735263238">"Жиек түсі"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"Жиек түрі"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"Шрифт тобы"</string>
-    <string name="captioning_preview_text" msgid="4067935959797375065">"Айдары осындай болады"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитр осындай болады"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Бастапқы"</string>
     <string name="color_title" msgid="4258931051732243983">"Түс"</string>
@@ -1677,7 +1677,7 @@
     <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - айнымалы токпен толғанша <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - USB арқылы толғанша <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - сымсыз толғанша <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Соңғы толық зарядтаудан бері пайдалану"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"Соңғы толық зарядталғаннан бері пайдаланылғаны"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ажыратылғаннан бері батарея қолданысы"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Қайта реттелгеннен бергі батарея қолданысы"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Батареядағы уақыт <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1686,7 +1686,7 @@
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Экран қосулы"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS қосулы"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ояту"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Белсенді режим"</string>
     <string name="battery_stats_phone_signal_label" msgid="3537569115723850618">"Ұялы желі сигналы"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
@@ -1874,8 +1874,8 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"өшіруде"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"Аймақ"</string>
-    <string name="gadget_sync" msgid="858895763714222152">"Синх"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Орын"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"Синхрондау"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Жарықтығы - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"Авто"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"толық"</string>
@@ -1919,7 +1919,7 @@
     <string name="backup_data_summary" msgid="708773323451655666">"Қолданба дерекқоры, Wi‑Fi кілтсөздері және басқа параметрлердің сақтық көшірмесін Google серверлеріне сақтаңыз"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Сақтық есептік жазба"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Қолданба деректерін қамту"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"Aвтоматтық қалпына келтіру"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Aвтоматты қалпына келтіру"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Қолданбаны қайта орнатқанда, параметрлер және деректердің сақтық көшірмесін қалпына келтіру"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Сақтық көшірме жасау қызметі белсенді емес."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компьютер үстелінің сақтық көшірмесі"</string>
@@ -1987,7 +1987,7 @@
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Синх қателігі."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Синх орындалмады"</string>
     <string name="sync_active" msgid="8476943765960863040">"Синхрондау қосылған"</string>
-    <string name="account_sync_settings_title" msgid="5131314922423053588">"Синх"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Синхрондау"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Синх мәселесі орын алуда. Біраз уақыттан кейін оралады."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Есептік жазба қосу"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"Жұмыс профилі әлі қол жетімді емес"</string>
@@ -1997,7 +1997,7 @@
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Жалпы мағлұматтар дерекқоры істен шығарылсын ба?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Артқы шеп деректерін өшіру батарея жұмысын ұзартады және дерек қолданысын азайтады. Кейбір қолданбалар сонда да артқы шеп байланысын қолдануы мүмкін."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Қолданба дерекқорын авто синхрондау"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"Синх ҚОСУЛЫ"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Синхронизация ҚОСУЛЫ"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синх ӨШІРУЛІ"</string>
     <string name="sync_error" msgid="5060969083117872149">"Синх қателігі"</string>
     <string name="last_synced" msgid="4242919465367022234">"Соңғы рет синхр. мезгілі <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
@@ -2021,7 +2021,7 @@
     <string name="finish_button_label" msgid="481587707657751116">"Аяқтау"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Есептік жазба алынсын ба?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Бұл есептік жазбаны алып тастау нәтижесінде оның хабарлары, контактілері және басқа планшет деректері жойылады!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Бұл есептік жазбаны алу телефоннан барлық хабарлар, байланыстар және басқа деректерді жояды!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Бұл есептік жазбаны алып тастаса, телефоннан барлық хабарлар, контактілер мен басқа деректер жойылады!"</string>
     <string name="remove_account_failed" msgid="6980737964448187854">"Бұл өзгертуге әкімші рұқсат етпеген"</string>
     <string name="provider_label" msgid="7724593781904508866">"Итеру жазылымдары"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2126,12 +2126,12 @@
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Дерекқорды авто-синхрондау"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM карталары"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"Ұялы желілер"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Деректерді авто-синхрондау"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Деректерді автосинхрондау"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Жеке деректерді авто-синхрондау"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Жұмыс деректерін авто-синхрондау"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Айналымды өзгерту…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Дерекқор қолдану айналымын қайта реттеу күні:"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"Бұл кезең аралығында ешқандай қолданба дерекқор пайдаланған жоқ."</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"Бұл уақыт аралығында ешқандай қолданба дерек пайдаланған жоқ."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Белсенді режим"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Фондық режим"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"шектеулі"</string>
@@ -2162,8 +2162,8 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Деректерді авто-сихрондау өшірілсін бе?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Cіз интернетте есептік жазбаларыңызға енгізген кез келген өзгертулер планшетіңізге автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір есептік жазбалар сіз планшетте енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Cіз интернетте есептік жазбаларыңызға енгізген кез келген өзгертулер телефоныңызға автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір есептік жазбалар сіз телефонда енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Дереқорды авто-синхрондау өшірілсін бе?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Бұл дерекқор мен батарея қолдануды қорғайды, бірақ соңғы ақпаратты жинау үшін әр есептік жазбаны қолмен синхрондау қажет болады. Және жаңартулар жасалғанда сізге хабар жіберілмейді."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автосинхрондау өшірілсін бе?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Бұл трафик пен батарея зарядын үнемдейді, бірақ соңғы ақпаратты жинау үшін әр есептік жазбаны қолмен синхрондау қажет болады. Сондай-ақ жаңартулар шыққанда, хабарландыру жіберілмейді."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Қолданыс айналымын қайта реттеу күні"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Әр айдың күні:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Параметрлер"</string>
@@ -2381,7 +2381,7 @@
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Осы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> басқа NFC құрылғысына тигенде деректер алмасуға рұқсат ету"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Планшет басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"Аймақ"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"Орын"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Қолданбаға аймағыңызға қатысты ақпаратты қолдануға рұқсат беру"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Артқа"</string>
     <string name="wizard_next" msgid="3606212602795100640">"Келесі"</string>
@@ -2529,7 +2529,7 @@
     <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығын тыю"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Осы қолданбадан келген хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Басымды ретінде белгілеу"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Осы қолданба хабарландыруларын Мазаламаңыз параметрі Басымдық күйіне орнатылғанда ғана естілуіне рұқсат ету"</string>
+    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Осы қолданба хабарландыруларының Мазаламау параметрі Маңызды күйіне орнатылғанда ғана естілуіне рұқсат ету"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Қысқаша көрсетуге рұқсат ету"</string>
     <string name="app_notification_peekable_summary" msgid="678845517890921158">"Қолданбаның ағымдағы экрандағы көрініске сырғыту арқылы белгілі бір хабарландыруларды ерекшелеуіне рұқсат ету"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Маңызды мазмұнды жасыру"</string>
@@ -2548,9 +2548,9 @@
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Белгісіз"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Ережені конфигурациялау"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Уақыт ережесі"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Көрсетілген уақыттарда «Мазаламаңыз» режимін қосу туралы автоматты ереже орнатылған"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Көрсетілген уақыттарда «Мазаламау» режимін қосу туралы автоматты ереже орнатылған"</string>
     <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Оқиға ережесі"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Көрсетілген оқиғалар кезінде «Мазаламаңыз» режимін қосу туралы автоматты ереже орнатылған"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Көрсетілген оқиғалар кезінде «Мазаламау» режимін қосу туралы автоматты ереже орнатылған"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Келесінің оқиғалары барысында"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> оқиғалары барысында"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"кез келген күнтізбе"</string>
@@ -2571,7 +2571,7 @@
     <string name="zen_mode_calls" msgid="7051492091133751208">"Қоңыраулар"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Хабарлар"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Таңдалған хабарлар"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Кез келгенінен бастап"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Бәрінен"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Тек контактілерден ғана"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Тек жұлдызша қойылған контактілерден"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ешқандай"</string>
@@ -2714,7 +2714,7 @@
     <string name="usage_access_description" msgid="1352111094596416795">"Пайдалану мүмкіндігі қолданбаға сіз пайдаланатын басқа қолданбаларды және қаншалықты жиі пайдаланатыңыз туралы ақпаратты, сондай-ақ операторды, тіл параметрлерін және басқа мәліметтерді бақылауға мүмкіндік береді."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Жад"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Жад туралы мәліметтер"</string>
-    <string name="always_running" msgid="6042448320077429656">"Әрқашан іске қосылып тұрады (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="always_running" msgid="6042448320077429656">"Әрдайым қосулы (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="6611250683037700864">"Кейде іске қосылады (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="rarely_running" msgid="348413460168817458">"Сирек іске қосылады (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="memory_max_use" msgid="6874803757715963097">"Ең көп"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 171d51b..ecc3e8f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -2751,16 +2751,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Apl bantu membantu anda mengenal pasti dan bertindak pada maklumat yang berguna tanpa perlu bertanya. Sesetengah apl menyokong pelancar dan perkhidmatan input suara untuk memberi anda bantuan bersepadu."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Penggunaan memori purata"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Penggunaan memori maksimum"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Penggunaan memori"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Penggunaan apl"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Butiran"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"Purata <xliff:g id="SIZE">%1$s</xliff:g> memori digunakan dalam 3 jam yang terakhir"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"Tiada memori digunakan dalam 3 jam yang terakhir"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Isih mengikut penggunaan purata"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Isih mengikut penggunaan maksimum"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Prestasi"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 712f6eb..991e8eb 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -2752,16 +2752,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Assist app များသည် မေးစရာမလိုဘဲ အသုံးဝင်သော အချက်အလက်များအား ခွဲခြားရန်နှင့် ဆောင်ရွက်ရန် ကူညီသည်။ အချို့ app များသည် သင့်အား ဘက်ပေါင်းစုံမှ ကူညီနိုင်ရန် launcher နှင့် အသံဖြင့်ထည့်သွင်းဝန်ဆောင်မှု နှစ်ခုစလုံးအား အထောက်အပံ့ပြုသည်။"</string>
     <string name="average_memory_use" msgid="829566450150198512">"ပျမ်းမျှ မှတ်ဉာဏ် သုံးစွဲမှု"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"မှတ်ဉာဏ် အများဆုံး အသုံးပြုမှု"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"မှတ်ဉာဏ် သုံးစွဲမှု"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"App သုံးစွဲမှု"</string>
+    <string name="memory_details" msgid="5943436005716991782">"အသေးစိတ်"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"<xliff:g id="SIZE">%1$s</xliff:g> လွန်ခဲ့သော ၃ နာရီအတွင်း သုံးသည့် ပျမ်းမျှ မှတ်ဉာဏ်"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"လွန်ခဲ့သော ၃ နာရီအတွင်း မှတ်ဉာဏ်သုံးစွဲမှုမရှိပါ"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"ပျှမ်းမျှသုံးစွဲမှုအရ စီရန်"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"အများဆုံးသုံးစွဲမှုအရ စီရန်"</string>
     <string name="memory_performance" msgid="5661005192284103281">"ဖျော်ဖြေတင်ဆက်မှု"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 7e51ba7..0442bf1 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -2751,16 +2751,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"सहायता अनुप्रयोगहरूले तपाईँलाई नसोधेर नै प्रयोग जानकारी पहिचान गर्न र यसमा कार्य गर्न मद्दत गर्दछ। केही अनुप्रयोगहरूले तपाईंलाई एकीकृत सहायता दिन दुवै लन्चर र आवाज इनपुट समर्थन गर्दछ।"</string>
     <string name="average_memory_use" msgid="829566450150198512">"औसत मेमोरी प्रयोग"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"अधिकतम मेमोरी प्रयोग"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"मेमोरी प्रयोग"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"अनुप्रयोग उपयोग"</string>
+    <string name="memory_details" msgid="5943436005716991782">"विवरणहरू"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"<xliff:g id="SIZE">%1$s</xliff:g> औसत मेमोरी पछिल्लो ३ घण्टामा प्रयोग गरियो"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"पछिल्लो ३ घण्टामा कुनै मेमोरी प्रयोग गरिएन"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"औसत प्रयोगद्वारा क्रमबद्ध गर्नुहोस्"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"अधिकतम प्रयोगद्वारा क्रमबद्ध गर्नुहोस्"</string>
     <string name="memory_performance" msgid="5661005192284103281">"कार्यसम्पादन"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 92b7e65..85c12c9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2768,16 +2768,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Aplicațiile asistent vă ajută să identificați informațiile utile și să acționați pe baza lor, fără ca dvs. să solicitați ceva. Pentru a vă oferi o asistență integrată, unele aplicații acceptă atât serviciile cu lansatoare, cât și pe cele de intrare vocală."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Utilizare medie a memoriei"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Utilizare maximă a memoriei"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Utilizarea memoriei"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Utilizarea de către aplicații"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Detalii"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"În ultimele 3 ore s-a folosit o memorie medie de <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"În ultimele 3 ore memoria nu a fost folosită deloc"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Sortați după utilizarea medie"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Sortați după utilizarea maximă"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Performanță"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d1c9d2e..8d2f378 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2783,16 +2783,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Приложения-помощники позволяют находить полезную информацию и работать с ней. Для большего удобства некоторые из них поддерживают и панель запуска, и голосовой ввод."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Средний объем исп. памяти"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Макс. объем исп. памяти"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Используемая память"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Приложения"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Подробности"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"За последние 3 часа использовано <xliff:g id="SIZE">%1$s</xliff:g> памяти"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"За последние 3 часа приложение не обращалось к памяти"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Упорядочить по средн. объему исп. памяти"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Упорядочить по макс. объему исп. памяти"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Производительность"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index e19e1fb..080ad86 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -2753,16 +2753,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"සහාය යෙදුම් මඟින් අසන්නේ නැතිව ප්‍රයෝජනවත් තොරතුරු අඳුනා ගෙන එය මත ක්‍රියා කිරීමට ඔබට උදව් කරයි. සමහර යෙදුම් ඔබට සංකලිත සහාය ලබා දීමට දියත් කරන සහ හඬ ආදාන සේවා දෙකටම සහාය දක්වයි."</string>
     <string name="average_memory_use" msgid="829566450150198512">"සාමාන්‍ය මතකය භාවිතය"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"උපරිම මතක භාවිතය"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"මතකය භාවිතය"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"යෙදුම් භාවිතය"</string>
+    <string name="memory_details" msgid="5943436005716991782">"විස්තර"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"පසුගිය පැය 3 තුළ භාවිතා කළ සාමාන්‍ය මතකය <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"පසුගිය පැය 3 තුළ මතකය භාවිතා කර නැත"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"සාමාන්‍ය භාවිතය මඟින් වර්ග කිරීම"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"උපරිම භාවිතය මඟින් වර්ග කිරීම"</string>
     <string name="memory_performance" msgid="5661005192284103281">"කාර්යසාධනය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b6d074e..703f7ff 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2783,16 +2783,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Pomocné aplikácie vám umožnia identifikovať užitočné informácie bez toho, aby ste ich museli vyžiadať, a tiež vykonať na základe nich ďalšie kroky. Niektoré aplikácie podporujú spúšťač aj služby hlasového výstupu, aby vám poskytli integrovanú pomoc."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Priemerné využitie pamäte"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Maximálne využitie pamäte"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Využitie pamäte"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Využitie aplikácií"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Podrobnosti"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"Za posledné 3 hodiny bolo priemerné využitie pamäte <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"Za posledné 3 hodiny nebola využitá žiadna pamäť"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Zoradiť podľa priemerného využitia"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Zoradiť podľa maximálneho využitia"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Výkonnosť"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8b477e8..46beb77 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1310,8 +1310,8 @@
     <string name="show_running_services" msgid="5736278767975544570">"Pokaži storitve, ki se izvajajo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija v sili"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Ponastavitev nastavitev aplikacij"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Želite ponastaviti nastavitve aplikacij?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"S tem se bodo ponastavile vse nastavitve za:\n\n "<li>"onemogočene aplikacije,"</li>\n" "<li>"obvestila za onemogočene aplikacije,"</li>\n" "<li>"privzete aplikacije za dejanja,"</li>\n" "<li>"omejitev prenosa podatkov v ozadju za aplikacije,"</li>\n" "<li>"omejitve dovoljenj."</li>\n\n" Podatkov iz aplikacij ne boste izgubili."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ponastavitev aplikacij"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
@@ -1815,7 +1815,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 ur"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih procesov"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"Skrivanje sistemskih procesov"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"Prikaži odstotke"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uporaba USS-ja"</string>
@@ -2783,16 +2783,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Aplikacije za pomoč vam pomagajo odkriti uporabne informacije in se ravnati po njih, ne da bi vam bilo treba vprašati. Nekatere aplikacije podpirajo storitve zaganjalnika in glasovnega vnosa pri zagotavljanju integrirane pomoči."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Povprečna uporaba pomnilnika"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Največja uporaba pomnilnika"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Uporaba pomnilnika"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Uporaba aplikacije"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Podrobnosti"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"Povprečno <xliff:g id="SIZE">%1$s</xliff:g> uporabljenega pomnilnika v zadnjih 3 urah"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"V zadnjih 3 urah ni bilo uporabe pomnilnika"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Razvrsti glede na povprečno uporabo"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Razvrsti glede na največjo uporabo"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Izvajanje"</string>
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq-rAL/arrays.xml
index 1cef583..0f33dce 100644
--- a/res/values-sq-rAL/arrays.xml
+++ b/res/values-sq-rAL/arrays.xml
@@ -533,7 +533,7 @@
     <item msgid="3022922196817563960">"Kritik"</item>
   </string-array>
   <string-array name="proc_stats_process_states">
-    <item msgid="5069825997142785829">"I qëndrueshëm"</item>
+    <item msgid="5069825997142785829">"Pa ndalim"</item>
     <item msgid="5779398140277006695">"Aktiviteti kryesor"</item>
     <item msgid="1439598363694578255">"E rëndësishme (në plan të parë)"</item>
     <item msgid="3396458970745718652">"E rëndësishme (sfondi)"</item>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index aec7363..8f429c5 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -876,7 +876,7 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Statusi i telefonit"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Përditësimet e sistemit"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Versioni për \"Android\""</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Versioni i Android-it"</string>
     <string name="model_number" msgid="3765737700545384794">"Numri i modelit"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID-ja e pajsjes"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versioni i brezit të bazës"</string>
@@ -907,7 +907,7 @@
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Rrjeti"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC e Wi‑Fi"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"Adresa e \"Bluetooth-it\""</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"Adresa e Bluetooth-it"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numri i serisë"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nuk ofrohet"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Koha aktive"</string>
@@ -1062,14 +1062,14 @@
     <string name="reset_network_title" msgid="4557113742173895074">"Rivendosja e cilësimeve të rrjetit"</string>
     <string name="reset_network_desc" msgid="581668983587311282">"Kjo do të rivendosë të gjitha cilësimet e rrjetit, përfshirë:\n\n"<li>"Wi‑Fi"</li>\n<li>"Të dhënat celulare"</li>\n<li>"Bluetooth-in"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Rivendos cilësimet"</string>
-    <string name="reset_network_final_desc" msgid="6388371121099245116">"Të rivendosen të gjitha cilësimet e rrjetit? Këtë veprim nuk mund ta zhbësh!"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"Të rivendosen të gjitha cilësimet e rrjetit? Ky veprim nuk mund të zhbëhet!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Rivendos cilësimet"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Të rivendoset?"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Cilësimet e rrjetit janë rivendosur"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Rivendos pajisjen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rivendosja e të dhënave të fabrikës"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" të tabletit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Sistemin dhe të dhënat e aplikacionit dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" të telefonit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Sistemin dhe të dhënat e aplikacionit dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e tabletit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat dhe cilësimet e sistemit dhe aplikacionit"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e telefonit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat dhe cilësimet e sistemit dhe aplikacionit"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
@@ -1081,7 +1081,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Spastro të gjitha të dhënat në kartën SD, si muzikën ose fotografitë"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rivendos tabletin"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rivendose telefonin"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"Të spastrohen të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara? Këtë veprim nuk mund ta zhbësh!"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Të spastrohen të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara? Ky veprim nuk mund të kthehet mbrapsht!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Spastroji të gjitha"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Nuk u krye një rivendosje sepse shërbimi Pastrimi i sistemit nuk është i disponueshëm."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Të rivendoset?"</string>
@@ -1182,13 +1182,13 @@
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Rreth tabletit"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Informacion mbi telefonin"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Shiko informacionin ligjor, statusin dhe versionin e softuerit"</string>
-    <string name="legal_information" msgid="5769301644270604095">"Informacion ligjor"</string>
+    <string name="legal_information" msgid="5769301644270604095">"Informacioni ligjor"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontribuuesit"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informacion për rregullat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Të drejtat e autorit"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Kushtet e përgjithshme"</string>
-    <string name="webview_license_title" msgid="2813507464175738967">"Licenca e WebView të sistemit"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licenca e WebView në sistem"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imazhet e sfondit"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Ofruesit e imazheve satelitore:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencat me burim të hapur"</string>
@@ -1246,7 +1246,7 @@
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Menaxho dhe hiq aplikacionet e instaluara"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikacionet"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Menaxho aplikacionet, konfiguro shkurtoret e hapjes së shpejtë"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"Cilësimet e aplikacionit"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"Cilësimet e apl."</string>
     <string name="install_applications" msgid="4872012136210802181">"Burime të panjohura"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Lejo të gjitha burimet e apl."</string>
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Lejon instalimin e aplikacioneve jashtë \"Luaj me Google\""</string>
@@ -1255,7 +1255,7 @@
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefoni dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione nga burime të panjohura. Ti pranon që je plotësisht përgjegjës për çdo dëm ndaj telefonit ose çdo humbje të të dhënave që mund të rezultojë nga përdorimi i këtyre aplikacioneve."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cilësimet e përparuara"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivizo më shumë opsione të cilësimeve"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Informacioni mbi aplikacionin"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Informacioni i apl."</string>
     <string name="storage_label" msgid="8700867073480107253">"Hapësira ruajtëse"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Hap me parazgjedhje"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Parazgjedhjet"</string>
@@ -1292,7 +1292,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Shfaq shërbimet që po ekzekutohen"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Shfaq proceset specifike"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacioni i emergjencave"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Rivendos preferencat e aplikacionit"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Rivendos preferencat e apl."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Të rivendosen preferencat e aplikacionit?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Kjo do t\'i rivendosë të gjitha preferencat për:\n\n "<li>"Aplikacionet e çaktivizuara"</li>\n" "<li>"Njoftimet e çaktivizuara të aplikacionit"</li>\n" "<li>"Aplikacionet e parazgjedhura për veprimet"</li>\n" "<li>"Kufizimet e të dhënave në sfond për aplikacionet"</li>\n" "<li>"Çdo kufizim të lejes"</li>\n\n" Nuk do të humbësh asnjë të dhënë aplikacioni."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Rivendos aplikacionet"</string>
@@ -1313,7 +1313,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hapësira SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Po llogarit përsëri madhësinë…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Të fshihen të dhënat e aplikacionit?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Të gjitha të dhënat e këtij aplikacioni do të fshihen përgjithmonë. Kjo përfshin të gjithë skedarët, cilësimet, llogaritë, bazat e të dhënave, etj."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Të gjitha të dhënat e këtij aplikacioni do të fshihen përgjithmonë. Kjo përfshin të gjithë skedarët, cilësimet, llogaritë, bazat e të dhënave etj."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Në rregull!"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Anulo"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1349,15 +1349,15 @@
     <string name="invalid_location" msgid="4354595459063675191">"Vendndodhja e instalimit nuk është e vlefshme."</string>
     <string name="system_package" msgid="1352722848400644991">"Përditësimet e sistemit nuk mund të instalohen në median e jashtme."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Të ndalohet me forcë?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Nëse e ndalon me detyrim një aplikacion, ai mund të sillet në mënyrë të gabuar"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Nëse e ndalon me forcë një aplikacion, ai mund të përjetojë çrregullime në funksionim."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nuk mundi të zhvendoste aplikacionin. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Vendndodhja e preferuar e instalimit"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ndrysho vendndodhjen e preferuar të instalimit për aplikacione të reja"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Të çaktivizohet aplikacioni i integruar?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Nëse çaktivizon një aplikacion të integruar, aplikacionet e tjera mund të veprojnë gabim."</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Nëse çaktivizon një aplikacion të integruar, aplikacionet e tjera mund të përjetojnë çrregullime në funksionim."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Të fshihen të dhënat dhe të çaktivizohet aplikacioni?"</string>
-    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Nëse çaktivizon një aplikacion të integruar, aplikacionet e tjera mund të veprojnë gabim. Gjithashtu do të fshihen edhe të dhënat e tua."</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Nëse çaktivizon një aplikacion të integruar, aplikacionet e tjera mund të përjetojnë çrregullime në funksionim. Gjithashtu, do të fshihen edhe të dhënat e tua."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Të çaktivizohen njoftimet?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Nëse i çaktivizon njoftimet për këtë aplikacion, mund të humbasësh alarme dhe përditësime të rëndësishme."</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacionet e aplikacionit"</string>
@@ -1728,8 +1728,8 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Përdorimi i llogaritur i energjisë"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Përdorimi i vërejtur i energjisë"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Ndalo me forcë"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Informacioni mbi aplikacionin"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"Cilësimet e aplikacionit"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Informacioni i apl."</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"Cilësimet e apl."</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Cilësimet e ekranit"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Cilësimet e Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Cilësimet e Bluetooth-it"</string>
@@ -1769,7 +1769,7 @@
     <string name="process_stats_summary" msgid="109387941605607762">"Statistikat teknike për proceset në ekzekutim"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Përdorimi i memories"</string>
     <string name="process_stats_total_duration" msgid="7417201400853728029">"<xliff:g id="USEDRAM">%1$s</xliff:g> nga <xliff:g id="TOTALRAM">%2$s</xliff:g> të përdorura gjatë <xliff:g id="TIMEDURATION">%3$s</xliff:g> të fundit"</string>
-    <string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"<xliff:g id="PERCENT">%1$s</xliff:g> e memories RAM e përdorur gjatë <xliff:g id="TIMEDURATION">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"<xliff:g id="PERCENT">%1$s</xliff:g> e memories RAM është përdorur për <xliff:g id="TIMEDURATION">%2$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Sfondi"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Plani i parë"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Të ruajtura në memorien specifike"</string>
@@ -1929,7 +1929,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Fjalëkalimi i ri dhe konfirmimi nuk përputhen"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Caktimi i fjalëkalimit të rezervimit dështoi"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Të ndalohet krijimi i rezervimit të fjalëkalimeve Wi-Fi, faqeshënuesve, cilësimeve të tjera dhe të dhënave të aplikacionit si dhe të fshihen të gjitha kopjet në serverët e Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Të ndalohet krijimi i rezervimit të fjalëkalimeve të Wi-Fi, faqeshënuesve, cilësimeve të tjera dhe të dhënave të aplikacionit? Të fshihen gjithashtu edhe të gjitha kopjet në serverët e Google?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="944399039066318647">"Të ndalohet rezervimi i të dhënave të pajisjes (si p.sh. fjalëkalimet e Wi-Fi dhe historiku i telefonatave) dhe të dhënat e aplikacioneve (si cilësimet dhe skedarët e ruajtur nga aplikacionet), si dhe të spastrohen të gjitha kopjet në Diskun e Google?"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Rezervo automatikisht në largësi të dhënat e pajisjes (si p.sh. fjalëkalimet e Wi-Fi dhe historikun e telefonatave) dhe të dhënat e aplikacioneve (si p.sh. cilësimet dhe skedarët e ruajtur nga aplikacionet).\n\nKur aktivizon rezervimin automatik, të dhënat e pajisjes dhe të aplikacioneve ruhen periodikisht në largësi. Të dhënat e aplikacioneve mund të jenë çdo e dhënë që ka ruajtur një aplikacion (bazuar në cilësimet e zhvilluesit), duke përfshirë të dhëna ndoshta delikate si kontaktet, mesazhet dhe fotografitë."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Cilësimet e administrimit të pajisjes"</string>
@@ -2012,7 +2012,7 @@
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendari"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktet"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Mirë se vjen në sinkronizimin e Google!"</font>" \nNjë metodë e Google për të sinkronizuar të dhënat për të të lejuar qasje te kontaktet, takimet dhe të tjera, kudo ku të ndodhesh."</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"Cilësimet e sinkronizimit të aplikacionit"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"Cilësimet e sinkronizimit të apl."</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Të dhënat dhe sinkronizimi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Ndërro fjalëkalimin"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Cilësimet e llogarisë"</string>
@@ -2109,7 +2109,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Përdorimi i të dhënave"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Përdorimi i aplikacionit"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACION MBI APLIKACIONIN"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIONI I APL."</string>
     <string name="data_usage_cellular_data" msgid="4859424346276043677">"Të dhënat celulare"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Cakto kufirin e të dhënave"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cikli i përdorimit të të dhënave"</string>
@@ -2152,7 +2152,7 @@
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Të dhënat 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Plani i parë:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"Sfondi:"</string>
-    <string name="data_usage_app_settings" msgid="2279171379771253165">"Cilësimet e aplikacionit"</string>
+    <string name="data_usage_app_settings" msgid="2279171379771253165">"Cilësimet e apl."</string>
     <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"Kufizo të dhënat në sfond të aplikacionit"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"Çaktivizo të dhënat në sfond në rrjetet celulare."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"Për të kufizuar të dhënat në sfond për këtë aplikacion, në fillim cakto një kufi të të dhënave celulare."</string>
@@ -2527,9 +2527,9 @@
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Asnjë aplikacion i zgjedhur nuk ka kërkuar qasje në \"Mos shqetëso\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bllokoji të gjitha"</string>
-    <string name="app_notification_block_summary" msgid="9049487483231233726">"Mos trego asnjëherë njoftime nga ky aplikacion"</string>
+    <string name="app_notification_block_summary" msgid="9049487483231233726">"Mos shfaq asnjëherë njoftime nga ky aplikacion"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Trajtoje si prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Lejo dëgjimin e njoftimeve të këtij aplikacioni kur \"Mos shqetëso\" është vendosur në \"Vetëm me prioritet\""</string>
+    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Lejo dëgjimin e njoftimeve të këtij aplikacioni kur modaliteti \"Mos shqetëso\" të vendoset në gjendjen \"Vetëm me prioritet\""</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Lejo përgjimin"</string>
     <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lejoje këtë aplikacion që të theksojë njoftime të caktuara duke i rrëshqitur shkurtimisht në pamje në ekranin aktual"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fshihe përmbajtjen delikate"</string>
@@ -2619,7 +2619,7 @@
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Qëndro në pamjen vertikale"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Qëndro në pamjen horizontale"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Qëndro në orientimin aktual"</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"Informacioni mbi IMEI-n"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informacioni i IMEI-t"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkriptimi"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Vazhdo"</string>
     <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar kodin PIN para se të nisë. Deri sa pajisja të nisë, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarme.\n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
@@ -2637,8 +2637,8 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kur fut kodin PIN për të nisur këtë pajisje, nuk do të ofrohen ende shërbimet e qasshmërisë si <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kur fut motivin për të nisur këtë pajisje, shërbimet e qasjes si <xliff:g id="SERVICE">%1$s</xliff:g> nuk do të jenë ende të gatshme."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kur fut fjalëkalimin tënd për të nisur këtë pajisje, shërbimet si <xliff:g id="SERVICE">%1$s</xliff:g> nuk do të jenë ende të disponueshëm."</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"Informacioni mbi IMEI-n"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informacioni relativ IMEI"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informacioni i IMEI-t"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informacioni përkatës i IMEI-t"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Foleja <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Hap me parazgjedhje"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> përdorur në <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
@@ -2720,7 +2720,7 @@
     <string name="memory_max_use" msgid="6874803757715963097">"Maksimale"</string>
     <string name="memory_avg_use" msgid="7382015389130622870">"Mesatare"</string>
     <string name="memory_max_desc" msgid="2861832149718335864">"Maksimale <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="memory_avg_desc" msgid="1551240906596518412">"Mesatare <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_avg_desc" msgid="1551240906596518412">"Mesatarisht <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="2116416853043103135">"Shpërfill optimizimet"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 67b37a3..babbdbc 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2751,16 +2751,11 @@
     <string name="assist_footer" msgid="2283187001990543739">"Asist uygulamaları, sormanıza gerek kalmadan faydalı bilgileri tanımlamanıza ve bunlar doğrultusunda harekete geçmenize yardımcı olur. Bazı uygulamalar, size entegre yardım sağlamak için hem başlatıcıyı hem de ses girişi hizmetlerini destekler."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Ortalama bellek kullanımı"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Maksimum bellek kullanımı"</string>
-    <!-- no translation found for memory_usage (1781358557214390033) -->
-    <skip />
-    <!-- no translation found for app_list_memory_use (6987417883876419338) -->
-    <skip />
-    <!-- no translation found for memory_details (5943436005716991782) -->
-    <skip />
-    <!-- no translation found for memory_use_summary (5608257211903075754) -->
-    <skip />
-    <!-- no translation found for no_memory_use_summary (2016900536806235588) -->
-    <skip />
+    <string name="memory_usage" msgid="1781358557214390033">"Bellek kullanımı"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Uygulama kullanımı"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Ayrıntılar"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"Son 3 saat içindeki <xliff:g id="SIZE">%1$s</xliff:g> ort. bellek kullanımı"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"Son 3 saat içinde bellek kullanımı yok"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Ort. kullanıma göre sırala"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Maks. kullanıma göre sırala"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Performans"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ab8c2cf..92de264 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1269,7 +1269,7 @@
     <string name="total_size_label" msgid="1048676419552557254">"總共"</string>
     <string name="application_size_label" msgid="8494609207373874267">"應用程式"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB 儲存裝置應用程式"</string>
-    <string name="data_size_label" msgid="8679376373625710107">"資料"</string>
+    <string name="data_size_label" msgid="8679376373625710107">"數據用量"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 儲存裝置資料"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"解除安裝"</string>
@@ -1313,7 +1313,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡儲存裝置"</string>
     <string name="recompute_size" msgid="7722567982831691718">"重新計算大小…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"您要刪除應用程式資料嗎？"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"這個應用程式的所有資料都將永遠遭到刪除，包含所有檔案、設定、帳戶、資料庫等。"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"系統會永久刪除這個應用程式的所有資料，包含所有檔案、設定、帳戶、資料庫等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"確定"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"取消"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1933,7 +1933,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"新密碼與確認密碼不符。"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"無法設定備份密碼"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"停止備份您的 Wi-Fi 密碼、書籤、其他設定，以及應用程式資料，並清除 Google 伺服器上儲存的所有複本嗎？"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"要停止備份您的 Wi-Fi 密碼、書籤、其他設定以及應用程式資料，並清除 Google 伺服器上儲存的所有複本嗎？"</string>
     <string name="fullbackup_erase_dialog_message" msgid="944399039066318647">"要停止備份裝置資料 (例如 Wi-Fi 密碼和通話紀錄) 以及應用程式資料 (例如應用程式所儲存的設定和檔案)，並清除 Google 雲端硬碟中的所有備份內容嗎？"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"在遠端自動備份裝置資料 (例如 Wi-Fi 密碼和通話紀錄) 以及應用程式資料 (例如應用程式所儲存的設定和檔案)。\n\n啟用自動備份功能後，系統會定期將裝置和應用程式資料儲存到遠端。應用程式資料泛指應用程式依據開發人員設定所儲存的任何資料，包括聯絡人、訊息和相片等可能具敏感性的資料。"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
@@ -2008,7 +2008,7 @@
     <string name="sync_in_progress" msgid="5151314196536070569">"目前正在同步處理…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"備份設定"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"備份我的設定"</string>
-    <string name="sync_menu_sync_now" msgid="6154608350395805683">"現在進行同步處理"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"立即進行同步處理"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"取消同步處理"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"輕觸此處可開始同步化 <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
@@ -2489,7 +2489,7 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先通知僅允許"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅顯示優先通知"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅限優先通知"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅允許鬧鐘"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全靜音"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -2533,9 +2533,9 @@
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"視為優先通知"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"當「零打擾」設定為 [僅顯示優先通知] 時，讓這個應用程式的通知發出聲響"</string>
+    <string name="app_notification_priority_summary" msgid="2538018111338754446">"當干擾模式設定為 [僅限優先通知] 時，讓這個應用程式的通知發出聲響"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"允許迅速瀏覽"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"讓這個應用程式將通知短暫滑入目前的畫面，藉此突顯特定通知"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"允許這個應用程式將特定通知暫時滑入目前的畫面，藉此突顯這些通知"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隱藏機密內容"</string>
     <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"當裝置鎖定時，隱藏這個應用程式通知中可能涉及私人資訊的內容"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"已封鎖"</string>
@@ -2721,10 +2721,10 @@
     <string name="always_running" msgid="6042448320077429656">"一律執行 (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="6611250683037700864">"有時執行 (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="rarely_running" msgid="348413460168817458">"很少執行 (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="memory_max_use" msgid="6874803757715963097">"最多"</string>
-    <string name="memory_avg_use" msgid="7382015389130622870">"平均"</string>
-    <string name="memory_max_desc" msgid="2861832149718335864">"最多 <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="memory_avg_desc" msgid="1551240906596518412">"平均 <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_max_use" msgid="6874803757715963097">"最高用量"</string>
+    <string name="memory_avg_use" msgid="7382015389130622870">"平均用量"</string>
+    <string name="memory_max_desc" msgid="2861832149718335864">"最高用量：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_avg_desc" msgid="1551240906596518412">"平均用量：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="2116416853043103135">"忽略最佳化設定"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 646c385..d2eb0ab 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -38,9 +38,12 @@
 
     <dimen name="crypt_clock_size">100sp</dimen>
 
+    <dimen name="setup_add_network_item_height">56dp</dimen>
     <!-- Size of padding to give in the wifi list when there is no icon -->
     <dimen name="setup_list_no_icon_padding">56dp</dimen>
-    <dimen name="setup_add_network_item_height">56dp</dimen>
+    <dimen name="setup_preference_icon_frame_margin_start">-4dp</dimen>
+    <dimen name="setup_preference_icon_frame_padding_end">12dp</dimen>
+    <dimen name="setup_preference_icon_frame_width">60dp</dimen>
     <dimen name="setup_wizard_margin_top">24dp</dimen>
 
     <dimen name="divider_height">3dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 700ec0b..9569b5c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2557,6 +2557,8 @@
     <string name="reset_network_final_button_text">Reset settings</string>
     <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
     <string name="reset_network_confirm_title">Reset?</string>
+    <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+    <string name="network_reset_not_available">Network reset is not available for this user</string>
     <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
     <string name="reset_network_complete_toast">Network settings have been reset</string>
 
@@ -5831,7 +5833,7 @@
     <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
     <string name="search_results_title">Settings</string>
     <!-- Text used as a search hint into the search box -->
-    <string name="search_menu">Search</string>
+    <string name="search_menu">Search settings</string>
     <!-- Text used as a search hint into the search box -->
     <string name="query_hint_text">Search settings</string>
 
@@ -5860,6 +5862,7 @@
     <string name="keywords_voice_input">recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset</string>
     <string name="keywords_text_to_speech_output">rate language default speak speaking tts accessibility reader blind</string>
     <string name="keywords_date_and_time">clock military</string>
+    <string name="keywords_network_reset">reset restore factory</string>
     <string name="keywords_factory_data_reset">wipe delete restore clear remove</string>
     <string name="keywords_printing">printer</string>
     <string name="keywords_sounds_and_notifications">speaker beep</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cca8a70..5e9d870 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -149,15 +149,6 @@
     <style name="TextAppearance.SetupWizardDescription" parent="@android:style/TextAppearance.Material.Subhead">
     </style>
 
-    <style name="SetupAddWifiNetwork">
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:gravity">start|center_vertical</item>
-        <item name="android:paddingStart">@dimen/setup_list_no_icon_padding</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Small</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
-    </style>
-
     <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
         <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
         <item name="android:minHeight">3dip</item>
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index f9b4fbe..721a3bf 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -48,7 +48,9 @@
 
     <!-- Network reset -->
     <PreferenceScreen
+        android:key="network_reset"
         android:title="@string/reset_network_title"
+        settings:keywords="@string/keywords_network_reset"
         android:fragment="com.android.settings.ResetNetwork" />
 
     <!-- Factory reset -->
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 7c911cb..a295759 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -54,6 +54,7 @@
     private static final String AUTO_RESTORE = "auto_restore";
     private static final String CONFIGURE_ACCOUNT = "configure_account";
     private static final String BACKUP_INACTIVE = "backup_inactive";
+    private static final String NETWORK_RESET = "network_reset";
     private static final String FACTORY_RESET = "factory_reset";
     private static final String TAG = "PrivacySettings";
     private IBackupManager mBackupManager;
@@ -244,5 +245,9 @@
                 UserManager.DISALLOW_FACTORY_RESET)) {
             nonVisibleKeys.add(FACTORY_RESET);
         }
+        if (UserManager.get(context).hasUserRestriction(
+                UserManager.DISALLOW_NETWORK_RESET)) {
+            nonVisibleKeys.add(NETWORK_RESET);
+        }
     }
 }
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 587b8e8..2e57dc3 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -26,6 +26,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.Process;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -191,6 +192,12 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        if (!Process.myUserHandle().isOwner()
+                || UserManager.get(getActivity()).hasUserRestriction(
+                UserManager.DISALLOW_NETWORK_RESET)) {
+            return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
+        }
+
         mContentView = inflater.inflate(R.layout.reset_network, null);
 
         establishInitialState();
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index f67467b..7762b89 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -22,6 +22,7 @@
 import android.net.NetworkPolicyManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.view.LayoutInflater;
@@ -108,6 +109,10 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        if (UserManager.get(getActivity()).hasUserRestriction(
+                UserManager.DISALLOW_NETWORK_RESET)) {
+            return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
+        }
         mContentView = inflater.inflate(R.layout.reset_network_confirm, null);
         establishFinalConfirmationState();
         return mContentView;
diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
deleted file mode 100644
index 1e802f0..0000000
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ /dev/null
@@ -1,154 +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.settings.sim;
-
-import com.android.settings.R;
-import com.android.settings.Settings.SimSettingsActivity;
-
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.provider.Settings;
-import android.support.v4.app.NotificationCompat;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
-
-import com.android.settings.Utils;
-
-import java.util.List;
-
-public class SimBootReceiver extends BroadcastReceiver {
-    private static final String TAG = "SimBootReceiver";
-    private static final int NOTIFICATION_ID = 1;
-
-    private TelephonyManager mTelephonyManager;
-    private Context mContext;
-    private SubscriptionManager mSubscriptionManager;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        mContext = context;
-        mSubscriptionManager = SubscriptionManager.from(mContext);
-        mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener);
-    }
-
-    private void detectChangeAndNotify() {
-        final int numSlots = mTelephonyManager.getSimCount();
-        final boolean isInProvisioning = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0) == 0;
-        boolean notificationSent = false;
-        int numSIMsDetected = 0;
-        int lastSIMSlotDetected = -1;
-
-        // Do not create notifications on single SIM devices or when provisiong.
-        if (numSlots < 2 || isInProvisioning) {
-            return;
-        }
-
-        // Cancel any previous notifications
-        cancelNotification(mContext);
-
-        // Clear defaults for any subscriptions which no longer exist
-        mSubscriptionManager.clearDefaultsForInactiveSubIds();
-
-        boolean dataSelected = SubscriptionManager.isUsableSubIdValue(
-                SubscriptionManager.getDefaultDataSubId());
-        boolean smsSelected = SubscriptionManager.isUsableSubIdValue(
-                SubscriptionManager.getDefaultSmsSubId());
-
-        // If data and sms defaults are selected, dont show notification (Calls default is optional)
-        if (dataSelected && smsSelected) {
-            return;
-        }
-
-        // We wait until SubscriptionManager returns a valid list of Subscription informations
-        // by checking if the list is empty.
-        // This is not completely correct, but works for most cases.
-        // See Bug: 18377252
-        List<SubscriptionInfo> sil = mSubscriptionManager.getActiveSubscriptionInfoList();
-        if (sil == null || sil.size() < 1) {
-            return;
-        } else {
-            // Create a notification to tell the user that some defaults are missing
-            createNotification(mContext);
-
-            if (sil.size() == 1) {
-                // If there is only one subscription, ask if user wants to use if for everything
-                Intent intent = new Intent(mContext, SimDialogActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.PREFERRED_PICK);
-                intent.putExtra(SimDialogActivity.PREFERRED_SIM, sil.get(0).getSimSlotIndex());
-                mContext.startActivity(intent);
-            } else if (!dataSelected) {
-                // TODO(sanketpadawe): This should not be shown if the user is looking at the
-                // SimSettings page - its just annoying
-                // If there are mulitple, ensure they pick default data
-                Intent intent = new Intent(mContext, SimDialogActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
-                mContext.startActivity(intent);
-            }
-        }
-
-    }
-
-    private void createNotification(Context context){
-        final Resources resources = context.getResources();
-
-        // TODO(sanketpadawe): This notification should not be dissmissable by the user
-        NotificationCompat.Builder builder =
-                new NotificationCompat.Builder(context)
-                .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
-                .setColor(context.getColor(R.color.sim_noitification))
-                .setContentTitle(resources.getString(R.string.sim_notification_title))
-                .setContentText(resources.getString(R.string.sim_notification_summary));
-        Intent resultIntent = new Intent(context, SimSettingsActivity.class);
-        resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent resultPendingIntent =
-                PendingIntent.getActivity(
-                context,
-                0,
-                resultIntent,
-                PendingIntent.FLAG_CANCEL_CURRENT
-                );
-        builder.setContentIntent(resultPendingIntent);
-        NotificationManager notificationManager =
-                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(NOTIFICATION_ID, builder.build());
-    }
-
-    public static void cancelNotification(Context context) {
-        NotificationManager notificationManager =
-                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.cancel(NOTIFICATION_ID);
-    }
-
-    private final OnSubscriptionsChangedListener mSubscriptionListener =
-            new OnSubscriptionsChangedListener() {
-        @Override
-        public void onSubscriptionsChanged() {
-            detectChangeAndNotify();
-        }
-    };
-
-}
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
new file mode 100644
index 0000000..fd54e9b
--- /dev/null
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -0,0 +1,142 @@
+/*
+ * 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.settings.sim;
+
+import com.android.internal.telephony.IccCardConstants;
+import com.android.settings.R;
+import com.android.settings.Settings.SimSettingsActivity;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.support.v4.app.NotificationCompat;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import java.util.List;
+
+public class SimSelectNotification extends BroadcastReceiver {
+    private static final String TAG = "SimSelectNotification";
+    private static final int NOTIFICATION_ID = 1;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final TelephonyManager telephonyManager = (TelephonyManager)
+                context.getSystemService(Context.TELEPHONY_SERVICE);
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        final int numSlots = telephonyManager.getSimCount();
+        final boolean isInProvisioning = Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) == 0;
+
+        // Do not create notifications on single SIM devices or when provisiong i.e. Setup Wizard.
+        if (numSlots < 2 || isInProvisioning) {
+            return;
+        }
+
+        // Cancel any previous notifications
+        cancelNotification(context);
+
+        // If sim state is not ABSENT or LOADED then ignore
+        String simStatus = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);
+        if (!(IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(simStatus) ||
+                IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(simStatus))) {
+            Log.d(TAG, "sim state is not Absent or Loaded");
+            return;
+        } else {
+            Log.d(TAG, "simstatus = " + simStatus);
+        }
+
+        int state;
+        for (int i = 0; i < numSlots; i++) {
+            state = telephonyManager.getSimState(i);
+            if (!(state == TelephonyManager.SIM_STATE_ABSENT
+                    || state == TelephonyManager.SIM_STATE_READY
+                    || state == TelephonyManager.SIM_STATE_UNKNOWN)) {
+                Log.d(TAG, "All sims not in valid state yet");
+                return;
+            }
+        }
+
+        List<SubscriptionInfo> sil = subscriptionManager.getActiveSubscriptionInfoList();
+        if (sil == null || sil.size() < 1) {
+            Log.d(TAG, "Subscription list is empty");
+            return;
+        }
+
+        // Clear defaults for any subscriptions which no longer exist
+        subscriptionManager.clearDefaultsForInactiveSubIds();
+
+        boolean dataSelected = SubscriptionManager.isUsableSubIdValue(
+                SubscriptionManager.getDefaultDataSubId());
+        boolean smsSelected = SubscriptionManager.isUsableSubIdValue(
+                SubscriptionManager.getDefaultSmsSubId());
+
+        // If data and sms defaults are selected, dont show notification (Calls default is optional)
+        if (dataSelected && smsSelected) {
+            Log.d(TAG, "Data & SMS default sims are selected. No notification");
+            return;
+        }
+
+        // Create a notification to tell the user that some defaults are missing
+        createNotification(context);
+
+        if (sil.size() == 1) {
+            // If there is only one subscription, ask if user wants to use if for everything
+            Intent newIntent = new Intent(context, SimDialogActivity.class);
+            newIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            newIntent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.PREFERRED_PICK);
+            newIntent.putExtra(SimDialogActivity.PREFERRED_SIM, sil.get(0).getSimSlotIndex());
+            context.startActivity(newIntent);
+        } else if (!dataSelected) {
+            // If there are mulitple, ensure they pick default data
+            Intent newIntent = new Intent(context, SimDialogActivity.class);
+            newIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            newIntent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
+            context.startActivity(newIntent);
+        }
+    }
+
+    private void createNotification(Context context){
+        final Resources resources = context.getResources();
+        NotificationCompat.Builder builder =
+                new NotificationCompat.Builder(context)
+                .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
+                .setColor(context.getColor(R.color.sim_noitification))
+                .setContentTitle(resources.getString(R.string.sim_notification_title))
+                .setContentText(resources.getString(R.string.sim_notification_summary));
+        Intent resultIntent = new Intent(context, SimSettingsActivity.class);
+        resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+        builder.setContentIntent(resultPendingIntent);
+        NotificationManager notificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(NOTIFICATION_ID, builder.build());
+    }
+
+    public static void cancelNotification(Context context) {
+        NotificationManager notificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(NOTIFICATION_ID);
+    }
+}
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index efc71d8..6d7ee4f 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -68,32 +68,6 @@
     private static final String KEY_CELLULAR_DATA = "sim_cellular_data";
     private static final String KEY_CALLS = "sim_calls";
     private static final String KEY_SMS = "sim_sms";
-    private static final String KEY_ACTIVITIES = "activities";
-    private static final int ID_INDEX = 0;
-    private static final int NAME_INDEX = 1;
-    private static final int APN_INDEX = 2;
-    private static final int PROXY_INDEX = 3;
-    private static final int PORT_INDEX = 4;
-    private static final int USER_INDEX = 5;
-    private static final int SERVER_INDEX = 6;
-    private static final int PASSWORD_INDEX = 7;
-    private static final int MMSC_INDEX = 8;
-    private static final int MCC_INDEX = 9;
-    private static final int MNC_INDEX = 10;
-    private static final int NUMERIC_INDEX = 11;
-    private static final int MMSPROXY_INDEX = 12;
-    private static final int MMSPORT_INDEX = 13;
-    private static final int AUTH_TYPE_INDEX = 14;
-    private static final int TYPE_INDEX = 15;
-    private static final int PROTOCOL_INDEX = 16;
-    private static final int CARRIER_ENABLED_INDEX = 17;
-    private static final int BEARER_INDEX = 18;
-    private static final int ROAMING_PROTOCOL_INDEX = 19;
-    private static final int MVNO_TYPE_INDEX = 20;
-    private static final int MVNO_MATCH_DATA_INDEX = 21;
-    private static final int DATA_PICK = 0;
-    private static final int CALLS_PICK = 1;
-    private static final int SMS_PICK = 2;
 
     /**
      * By UX design we use only one Subscription Information(SubInfo) record per SIM slot.
@@ -104,16 +78,10 @@
     private List<SubscriptionInfo> mAvailableSubInfos = null;
     private List<SubscriptionInfo> mSubInfoList = null;
     private List<SubscriptionInfo> mSelectableSubInfos = null;
-
-    private SubscriptionInfo mCellularData = null;
-    private SubscriptionInfo mCalls = null;
-    private SubscriptionInfo mSMS = null;
-
     private PreferenceScreen mSimCards = null;
-
     private SubscriptionManager mSubscriptionManager;
-    private Utils mUtils;
-
+    private int mNumSlots;
+    private Context mContext;
 
     public SimSettings() {
         super(DISALLOW_CONFIG_SIM);
@@ -127,51 +95,52 @@
     @Override
     public void onCreate(final Bundle bundle) {
         super.onCreate(bundle);
+        mContext = getActivity();
 
         mSubscriptionManager = SubscriptionManager.from(getActivity());
-
-        if (mSubInfoList == null) {
-            mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
-            // FIXME: b/18385348, needs to handle null from getActiveSubscriptionInfoList
-        }
-        if (DBG) log("[onCreate] mSubInfoList=" + mSubInfoList);
-
-        createPreferences();
-        updateAllOptions();
-
-        SimBootReceiver.cancelNotification(getActivity());
-    }
-
-    private void createPreferences() {
         final TelephonyManager tm =
-            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-
+                (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
         addPreferencesFromResource(R.xml.sim_settings);
 
+        mNumSlots = tm.getSimCount();
         mSimCards = (PreferenceScreen)findPreference(SIM_CARD_CATEGORY);
-
-        final int numSlots = tm.getSimCount();
-        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
+        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(mNumSlots);
         mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
-        for (int i = 0; i < numSlots; ++i) {
-            // Less efficient than getActiveSubscriptionInfoList but we need to show a disable
-            // preference if the slot is empty
+        SimSelectNotification.cancelNotification(getActivity());
+    }
+
+    private final SubscriptionManager.OnSubscriptionsChangedListener mOnSubscriptionsChangeListener
+            = new SubscriptionManager.OnSubscriptionsChangedListener() {
+        @Override
+        public void onSubscriptionsChanged() {
+            if (DBG) log("onSubscriptionsChanged:");
+            updateSubscriptions();
+        }
+    };
+
+    private void updateSubscriptions() {
+        mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
+        for (int i = 0; i < mNumSlots; ++i) {
+            Preference pref = mSimCards.findPreference("sim" + i);
+            if (pref instanceof SimPreference) {
+                mSimCards.removePreference(pref);
+            }
+        }
+        mAvailableSubInfos.clear();
+        mSelectableSubInfos.clear();
+
+        for (int i = 0; i < mNumSlots; ++i) {
             final SubscriptionInfo sir = mSubscriptionManager
                     .getActiveSubscriptionInfoForSimSlotIndex(i);
-            SimPreference simPreference = new SimPreference(getActivity(), sir, i);
-            simPreference.setOrder(i-numSlots);
+            SimPreference simPreference = new SimPreference(mContext, sir, i);
+            simPreference.setOrder(i-mNumSlots);
             mSimCards.addPreference(simPreference);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
                 mSelectableSubInfos.add(sir);
             }
         }
-
-        updateActivitesCategory();
-    }
-
-    private void updateAvailableSubInfos(){
-        mAvailableSubInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
+        updateAllOptions();
     }
 
     private void updateAllOptions() {
@@ -180,8 +149,6 @@
     }
 
     private void updateSimSlotValues() {
-        mSubscriptionManager.getAllSubscriptionInfoList();
-
         final int prefSize = mSimCards.getPreferenceCount();
         for (int i = 0; i < prefSize; ++i) {
             Preference pref = mSimCards.getPreference(i);
@@ -227,7 +194,7 @@
 
     private void updateCallValues() {
         final Preference simPref = findPreference(KEY_CALLS);
-        final TelecomManager telecomManager = TelecomManager.from(getActivity());
+        final TelecomManager telecomManager = TelecomManager.from(mContext);
         final PhoneAccountHandle phoneAccount =
             telecomManager.getUserSelectedOutgoingPhoneAccount();
         final List<PhoneAccountHandle> allPhoneAccounts =
@@ -235,7 +202,7 @@
 
         simPref.setTitle(R.string.calls_title);
         simPref.setSummary(phoneAccount == null
-                ? getResources().getString(R.string.sim_calls_ask_first_prefs_title)
+                ? mContext.getResources().getString(R.string.sim_calls_ask_first_prefs_title)
                 : (String)telecomManager.getPhoneAccount(phoneAccount).getLabel());
         simPref.setEnabled(allPhoneAccounts.size() > 1);
     }
@@ -243,22 +210,17 @@
     @Override
     public void onResume() {
         super.onResume();
-
-        mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
-        // FIXME: b/18385348, needs to handle null from getActiveSubscriptionInfoList
-        if (DBG) log("[onResme] mSubInfoList=" + mSubInfoList);
-
+        mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
         final TelephonyManager tm =
                 (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
         tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-
-        updateAvailableSubInfos();
-        updateAllOptions();
+        updateSubscriptions();
     }
 
     @Override
     public void onPause() {
         super.onPause();
+        mSubscriptionManager.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
         final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
     }
@@ -283,7 +245,7 @@
     @Override
     public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen,
             final Preference preference) {
-        final Context context = getActivity();
+        final Context context = mContext;
         Intent intent = new Intent(context, SimDialogActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
@@ -325,13 +287,13 @@
         }
 
         public void update() {
-            final Resources res = getResources();
+            final Resources res = mContext.getResources();
 
-            setTitle(String.format(getResources()
+            setTitle(String.format(mContext.getResources()
                     .getString(R.string.sim_editor_title), (mSlotId + 1)));
             if (mSubInfoRecord != null) {
                 if (TextUtils.isEmpty(getPhoneNumber(mSubInfoRecord))) {
-                   setSummary(mSubInfoRecord.getDisplayName());
+                    setSummary(mSubInfoRecord.getDisplayName());
                 } else {
                     setSummary(mSubInfoRecord.getDisplayName() + " - " +
                             getPhoneNumber(mSubInfoRecord));
@@ -350,11 +312,13 @@
         }
 
         public void createEditDialog(SimPreference simPref) {
-            final Resources res = getResources();
+            final Resources res = mContext.getResources();
 
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
 
-            final View dialogLayout = getActivity().getLayoutInflater().inflate(
+            LayoutInflater inflater = (LayoutInflater)mContext
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            final View dialogLayout = inflater.inflate(
                     R.layout.multi_sim_dialog, null);
             builder.setView(dialogLayout);
 
@@ -397,7 +361,7 @@
             }
 
             final TelephonyManager tm =
-                        (TelephonyManager) getActivity().getSystemService(
+                        (TelephonyManager) mContext.getSystemService(
                         Context.TELEPHONY_SERVICE);
             String simCarrierName = tm.getSimOperatorNameForSubscription(mSubInfoRecord
                         .getSubscriptionId());
@@ -458,7 +422,7 @@
 
                 View rowView;
                 final ViewHolder holder;
-                Resources res = getResources();
+                Resources res = mContext.getResources();
                 int iconSize = res.getDimensionPixelSize(R.dimen.color_swatch_size);
                 int strokeWidth = res.getDimensionPixelSize(R.dimen.color_swatch_stroke_width);
 
@@ -515,7 +479,7 @@
     // be overridden for display purposes.
     private String getPhoneNumber(SubscriptionInfo info) {
         final TelephonyManager tm =
-            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+            (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
         return tm.getLine1NumberForSubscriber(info.getSubscriptionId());
     }