diff --git a/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg
index 428b2f4..8d330ce 100644
--- a/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
index db697a0..0bf53fc 100644
--- a/res/drawable-hdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_tile.jpg b/res/drawable-hdpi/setup_illustration_tile.jpg
index 9931a23..d518abd 100644
--- a/res/drawable-hdpi/setup_illustration_tile.jpg
+++ b/res/drawable-hdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_wifi.jpg b/res/drawable-hdpi/setup_illustration_wifi.jpg
index d38551e..f2b9c6a 100644
--- a/res/drawable-hdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg
index 52e7993..2b9b04b 100644
--- a/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
index 95e2b8c..9ab9117 100644
--- a/res/drawable-mdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_tile.jpg b/res/drawable-mdpi/setup_illustration_tile.jpg
index 7923fb4..f2e1bcb 100644
--- a/res/drawable-mdpi/setup_illustration_tile.jpg
+++ b/res/drawable-mdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_wifi.jpg b/res/drawable-mdpi/setup_illustration_wifi.jpg
index a497bf5..7f5e788 100644
--- a/res/drawable-mdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
index 03cd9d9..26cff1d 100644
--- a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
index fccea72..7359f56 100644
--- a/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
index 4a7ab38..386fc8d 100644
--- a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
index f21dffb..9b13e51 100644
--- a/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
index 05f7725..54362e7 100644
--- a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
index 3d1b3f3..dc9e385 100644
--- a/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
index da3f7d9..4f62b84 100644
--- a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
index 6a590b7..b57bc17 100644
--- a/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
index fd5da99..2c6b57e 100644
--- a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
index d6f2f82..b940a9b 100644
--- a/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg
index 2733f8e..ae67f38 100644
--- a/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
index b6b856e..ddad6d5 100644
--- a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_tile.jpg b/res/drawable-xhdpi/setup_illustration_tile.jpg
index 57bccca..8beeda8 100644
--- a/res/drawable-xhdpi/setup_illustration_tile.jpg
+++ b/res/drawable-xhdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_wifi.jpg b/res/drawable-xhdpi/setup_illustration_wifi.jpg
index a399c19..19478aa 100644
--- a/res/drawable-xhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg
index aec8d0f..18b885d 100644
--- a/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
index 4cb0c63..5b0a7a7 100644
--- a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_tile.jpg b/res/drawable-xxhdpi/setup_illustration_tile.jpg
index 2ba33fa..05d4804 100644
--- a/res/drawable-xxhdpi/setup_illustration_tile.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxhdpi/setup_illustration_wifi.jpg
index a27c93e..a28052b 100644
--- a/res/drawable-xxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg
index 448a651..6d97626 100644
--- a/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
index 13821f3..5be34fd 100644
--- a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_tile.jpg b/res/drawable-xxxhdpi/setup_illustration_tile.jpg
index 4e67026..9d5c4c9 100644
--- a/res/drawable-xxxhdpi/setup_illustration_tile.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
index 56c19b6..f2187cb 100644
--- a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable/wifi_signal_colored.xml b/res/drawable/wifi_signal_colored.xml
index 4eb41c0..91f8b88 100644
--- a/res/drawable/wifi_signal_colored.xml
+++ b/res/drawable/wifi_signal_colored.xml
@@ -20,22 +20,22 @@
         <level-list>
             <item android:maxLevel="0">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_1_light"
+                    android:src="@drawable/ic_wifi_lock_signal_1_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="1">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_2_light"
+                    android:src="@drawable/ic_wifi_lock_signal_2_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="2">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_3_light"
+                    android:src="@drawable/ic_wifi_lock_signal_3_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="3">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_4_light"
+                    android:src="@drawable/ic_wifi_lock_signal_4_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
         </level-list>
@@ -44,22 +44,22 @@
         <level-list>
             <item android:maxLevel="0">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_1_light"
+                    android:src="@drawable/ic_wifi_signal_1_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="1">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_2_light"
+                    android:src="@drawable/ic_wifi_signal_2_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="2">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_3_light"
+                    android:src="@drawable/ic_wifi_signal_3_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="3">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_4_light"
+                    android:src="@drawable/ic_wifi_signal_4_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
         </level-list>
diff --git a/res/layout/setup_wifi_required_info.xml b/res/layout/setup_wifi_required_info.xml
deleted file mode 100644
index 574366a..0000000
--- a/res/layout/setup_wifi_required_info.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wifi_required_info"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/setup_wizard_margin_top"
-    android:paddingBottom="6dip"
-    android:paddingStart="@dimen/setup_wizard_margin_sides"
-    android:paddingEnd="@dimen/setup_wizard_margin_sides"
-    android:text="@string/wifi_required_info_text"
-    android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a5746f7..71a8ff1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2535,28 +2535,18 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
-    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
-    <skip />
-    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
-    <skip />
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
     <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
     <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
-    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
-    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"important,priority,priority notifications"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"alarms"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"none,nothing,no interruptions"</string>
     <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
     <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
@@ -2693,6 +2683,5 @@
     <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
     <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
-    <!-- no translation found for apps_storage (4353308027210435513) -->
-    <skip />
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a5746f7..71a8ff1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2535,28 +2535,18 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
-    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
-    <skip />
-    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
-    <skip />
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
     <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
     <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
-    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
-    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"important,priority,priority notifications"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"alarms"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"none,nothing,no interruptions"</string>
     <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
     <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
@@ -2693,6 +2683,5 @@
     <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
     <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
-    <!-- no translation found for apps_storage (4353308027210435513) -->
-    <skip />
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a5746f7..71a8ff1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2535,28 +2535,18 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
-    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
-    <skip />
-    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
-    <skip />
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
     <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
     <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
-    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
-    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"important,priority,priority notifications"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"alarms"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"none,nothing,no interruptions"</string>
     <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
     <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
@@ -2693,6 +2683,5 @@
     <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
     <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
-    <!-- no translation found for apps_storage (4353308027210435513) -->
-    <skip />
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bb432ac..d4252a7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -984,7 +984,7 @@
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
     <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा को नई मेमोरी में ले जाएं"</string>
-    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"आप अपनी फ़ोटो, फ़ाइलों और ऐप डेटा को इस नए <xliff:g id="NAME">^1</xliff:g> में ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g> का समय लगता है और इससे आंतरिक मेमोरी में <xliff:g id="SIZE">^3</xliff:g> स्थान रिक्त हो जाएगा. इस प्रक्रिया के दौरान कुछ ऐप्स काम नहीं करेंगे."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"आप अपनी फ़ोटो, फ़ाइलों और ऐप डेटा को इस नए <xliff:g id="NAME">^1</xliff:g> में ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g> का समय लगता है और इससे आंतरिक मेमोरी में <xliff:g id="SIZE">^3</xliff:g> स्थान खाली हो जाएगा. इस प्रक्रिया के दौरान कुछ ऐप्स काम नहीं करेंगे."</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अभी ले जाएं"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"बाद में ले जाएं"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"अभी डेटा ले जाएं"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 4555ace..f1b7f19 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2535,28 +2535,18 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"დაწყების დრო"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"დასრულების დრო"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"შემდეგი დღის <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
-    <skip />
-    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
-    <skip />
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"შეწყვეტები"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ზარებისა და შეტყობინებების შემოსვლისას"</string>
     <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"როდის გსურთ შეწყვეტა?"</string>
     <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"რამდენი ხნით?"</string>
-    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
-    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"შეწყვეტა ყოველთვის"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"გამორთული,ყველა,ყველაფერი"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"მხოლოდ პრიორიტეტული შეწყვეტების დაშვება"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"მნიშვნელოვანი,პრიორიტეტული,პრიორიტეტული შეტყობინებები"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"მხოლოდ გაფრთხილებების დაშვება"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"გაფრთხილებები"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"არ დაუშვა შეწყვეტა"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"არცერთი,არაფერი,შეწყვეტის გარეშე"</string>
     <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"განუსაზღვრელი დროით"</string>
     <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წუთი</item>
@@ -2693,6 +2683,5 @@
     <string name="default_browser_title" msgid="8101772675085814670">"ბრაუზერის აპი"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"ნაგულისხმები ბრაუზერი არ არის"</string>
     <string name="default_app" msgid="6864503001385843060">"(ნაგულისხმევი)"</string>
-    <!-- no translation found for apps_storage (4353308027210435513) -->
-    <skip />
+    <string name="apps_storage" msgid="4353308027210435513">"აპების საცავი"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index bfb2941..ad22b51 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -2535,28 +2535,18 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ເວລາເລີ່ມ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ເວລາສິ້ນສຸດ"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ວັນ​ຕໍ່​ໄປ"</string>
-    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
-    <skip />
-    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
-    <skip />
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"ການລົບກວນ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"​ເມື່ອ​ມີ​ການ​ໂທ ຫຼື​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
     <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ທ່ານ​ຢາກ​ຈະ​ໃຫ້​ຖືກ​ຂັດ​ຈັງ​ຫວະ​ເມື່ອ​ໃດ?"</string>
     <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ດົນ​ປານ​ໃດ?"</string>
-    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
-    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ອະນຸຍາດໃຫ້ລົບກວນໄດ້ຕະຫຼອດ"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ປິດ,ທັງ​ໝົດ,ທຸກ​ຢ່າງ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ອະນຸຍາດ​ສະເພາະ​ການ​ລົບກວນ​ທີ່​ສຳຄັນ"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"ສຳ​ຄັນ,ບຸ​ລິ​ມະ​ສິດ,ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ອະ​ນຸ​ຍາດ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"ໂມງປຸກ"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ມີ​ການ​ລົບກວນ​ເລີຍ"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"ບໍ່​ມີ,ບໍ່​ມີ​ອັນ​ໃດ,ບໍ່​ມີ​ການ​ຂັດ​ຈັງ​ຫວະ"</string>
     <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ຢ່າງ​ບໍ່​ມີ​ກຳນົດ"</string>
     <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ນາ​ທີ</item>
@@ -2693,6 +2683,5 @@
     <string name="default_browser_title" msgid="8101772675085814670">"ແອັບ​ບ​ຣາວ​ເຊີ"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"ບໍ່​ມີ​ບ​ຣາວ​ເຊີ​ມາດ​ຕະ​ຖານ"</string>
     <string name="default_app" msgid="6864503001385843060">"(ຄ່າເລີ່ມຕົ້ນ)"</string>
-    <!-- no translation found for apps_storage (4353308027210435513) -->
-    <skip />
+    <string name="apps_storage" msgid="4353308027210435513">"ບ່ອນ​ຈັດ​ເກັບ​ແອັບ"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index ad1656e..8a4dfd9 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -979,7 +979,7 @@
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ആന്തരിക സംഭരണമായി ഉപയോഗിക്കുക"</string>
     <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"അപ്ലിക്കേഷനുകളും ഫോട്ടോകളും ഉൾപ്പെടെ ഈ ഉപകരണത്തിൽ മാത്രമായി എന്തും സംഭരിക്കാനായി. ഇത് മറ്റ് ഉപകരണങ്ങളിൽ പ്രവർത്തിക്കുന്നതിനെ തടയാൻ ഫോർമാറ്റുചെയ്യേണ്ടതുണ്ട്."</string>
     <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ആന്തരിക സംഭരണമായി ഫോർമാറ്റുചെയ്യൂ"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ഇത് സുരക്ഷിതമാക്കാൻ <xliff:g id="NAME_0">^1</xliff:g> എന്നത് ഇതിന് ഫോർമാറ്റുചെയ്യേണ്ടതുണ്ട്. \n\nഫോർമാറ്റുചെയ്‌തതിനുശേഷം, ഈ <xliff:g id="NAME_1">^1</xliff:g> ഈ ഉപകരണത്തിൽ മാത്രമേ പ്രവർത്തിക്കൂ. \n\n"<b>"ഫോർമാറ്റുചെയ്യുന്നത്, <xliff:g id="NAME_2">^1</xliff:g> എന്നതിൽ നിലവിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ വിവരവും മായ്‌ക്കുന്നതാണ്."</b>" വിവരം നഷ്‌ടപ്പെടുന്നത് ഒഴിവാക്കാൻ, അത് ബാക്കപ്പുചെയ്യുന്നത് പരിഗണിക്കുക."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ഇത് സുരക്ഷിതമാക്കാൻ <xliff:g id="NAME_0">^1</xliff:g> എന്നത് ഇതിന് ഫോർമാറ്റുചെയ്യേണ്ടതുണ്ട്. \n\nഫോർമാറ്റുചെയ്‌തതിനുശേഷം, ഈ <xliff:g id="NAME_1">^1</xliff:g> ഈ ഉപകരണത്തിൽ മാത്രമേ പ്രവർത്തിക്കൂ. \n\n"<b>"ഫോർമാറ്റുചെയ്യുന്നത്, <xliff:g id="NAME_2">^1</xliff:g> എന്നതിൽ നിലവിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ വിവരവും മായ്ക്കാനിടയാക്കും."</b>" വിവരം നഷ്‌ടപ്പെടുന്നത് ഒഴിവാക്കാൻ, അത് ബാക്കപ്പുചെയ്യുന്നത് പരിഗണിക്കുക."</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"മായ്‌ക്കുക, ഫോർമാറ്റുചെയ്യുക"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ഫോർമാറ്റുചെയ്യുന്നു…"</string>
     <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"അത് ഫോർമാറ്റുചെയ്യുമ്പോൾ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 9e69328..ecfb3e9 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -2523,28 +2523,18 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Эхлэх цаг"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Дуусах цаг"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> дараагийн өдөр"</string>
-    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
-    <skip />
-    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
-    <skip />
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Тасалдал"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Дуудлага болон мэдэгдэл ирэх үед"</string>
     <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Танд хэзээ саад болж болох вэ?"</string>
     <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Хэр удаан?"</string>
-    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
-    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Тасалдлыг байнга зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"унтраах,бүх,бүх зүйл"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Зөвхөн нэн тэргүүний тасалдлыг зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"чухал ач холбогдолтой, нэн тэргүүнд, нэн тэргүүний мэдэгдэл"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Зөвхөн анхааруулгыг зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"анхааруулгууд"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Бүү саад бол"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"байхгүй, юу ч байхгүй, мэдэгдэл байхгүй"</string>
     <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Тодорхойгүй"</string>
     <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минутууд</item>
@@ -2681,6 +2671,5 @@
     <string name="default_browser_title" msgid="8101772675085814670">"Хөтөч апп"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн веб хөтөч байхгүй"</string>
     <string name="default_app" msgid="6864503001385843060">"(Үндсэн)"</string>
-    <!-- no translation found for apps_storage (4353308027210435513) -->
-    <skip />
+    <string name="apps_storage" msgid="4353308027210435513">"Апп-ны санах ой"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index aea7131..a2a77f0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -975,20 +975,20 @@
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> imepangiliwa upya"</string>
     <string name="storage_format_failure" msgid="8343688274191391889">"Haikuweza kupangilia upya <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"Badilisha jina la hifadhi"</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"Baada ya kuifomati, unaweza kutumia <xliff:g id="NAME_0">^1</xliff:g> hii katika vifaa vingine. \n\nData yote katika <xliff:g id="NAME_1">^1</xliff:g> hii itafutwa. Hifadhi nakala rudufu ya maudhui yaliyomo humo kwanza. \n\n"<b>"Hifadhi nakala rudufu ya picha na maudhui mengine"</b>" \nHamishia faili zako za maudhui kwenye hifadhi mbadala kwenye kifaa hiki, au uyahamishie kwenye kompyuta ukitumia kebo ya USB. \n\n"<b>"Hifadhi nakala rudufu ya programu"</b>" \nProgramu zote zilizohifadhiwa katika <xliff:g id="NAME_6">^1</xliff:g> hii zitaondolewa na data yake ifutwe. Ili kusalia na programu hizi, zihamishie kwenye hifadhi mbadala kwenye kifaa hiki."</string>
-    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Unapoondoa <xliff:g id="NAME_0">^1</xliff:g> hii, programu zilizohifadhiwa humo zitaacha kufanya kazi, na faili za maudhui zilizohifadhiwa humo hazitapatikana hadi itakapopachikwa tena."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> hii imefomatiwa ili ifanye kazi kwenye kifaa hiki pekee. Haitafanya kazi kwenye vifaa vingine vyovyote."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Baada ya kupanga, unaweza kutumia <xliff:g id="NAME_0">^1</xliff:g> hii katika vifaa vingine. \n\nData yote katika <xliff:g id="NAME_1">^1</xliff:g> hii itafutwa. Hifadhi nakala rudufu ya maudhui yaliyomo humo kwanza. \n\n"<b>"Hifadhi nakala rudufu ya picha na maudhui mengine"</b>" \nHamishia faili zako za maudhui kwenye hifadhi mbadala katika kifaa hiki, au uyahamishie kwenye kompyuta ukitumia kebo ya USB. \n\n"<b>"Hifadhi nakala rudufu ya programu"</b>" \nProgramu zote zilizohifadhiwa katika <xliff:g id="NAME_6">^1</xliff:g> hii zitaondolewa na data yake ifutwe. Ili kusalia na programu hizi, zihamishie kwenye hifadhi mbadala katika kifaa hiki."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Unapoondoa <xliff:g id="NAME_0">^1</xliff:g> hii, programu zilizohifadhiwa ndani yake zitaacha kufanya kazi, na faili za maudhui zilizohifadhiwa ndani yake hazitapatikana hadi itakapopachikwa tena."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> hii imepangiliwa ili ifanye kazi kwenye kifaa hiki pekee. Haitafanya kazi kwenye vifaa vingine vyovyote."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>
-    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Tumia kama hifadhi inayohamishika kwa urahisi"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Tumia kama hifadhi inayohamishika"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Kwa ajili ya kuhamisha picha na maudhui mengine kati ya vifaa."</string>
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Tumia kama hifadhi ya ndani"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Kwa ajili ya kuhifadhi kitu chochote kwenye kifaa hiki tu, ikiwa ni pamoja na programu na picha. Inahitaji kufomati ambayo inaizuia isifanye kazi na vifaa vingine."</string>
-    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Fomati kama hifadhi ya ndani"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Hii inahitaji <xliff:g id="NAME_0">^1</xliff:g> ifomatiwe ili kuifanya salama. \n\nBaada ya kuifomati, <xliff:g id="NAME_1">^1</xliff:g> hii itafanya kazi kwenye kifaa hiki pekee. \n\n"<b>"Kufomati kutafuta data yote iliyohifadhiwa kwa sasa katika <xliff:g id="NAME_2">^1</xliff:g>."</b>" Kuepuka kupoteza data, hifadhi nakala rudufu."</string>
-    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Futa data yote na fomati"</string>
-    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Inafomati <xliff:g id="NAME">^1</xliff:g>..."</string>
-    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Usiondoe <xliff:g id="NAME">^1</xliff:g> wakati inafomati."</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Kwa ajili ya kuhifadhi kitu chochote kwenye kifaa hiki tu, ikiwa ni pamoja na programu na picha. Inahitaji kupangwa ili isifanye kazi na vifaa vingine."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Panga kawa hifadhi ya ndani"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Hii inahitaji <xliff:g id="NAME_0">^1</xliff:g> ipangwe upya ili kuifanya salama. \n\nBaada ya kuipanga, <xliff:g id="NAME_1">^1</xliff:g> hii itafanya kazi kwenye kifaa hiki pekee. \n\n"<b>"Kupanga kutafuta data yote iliyohifadhiwa kwa sasa katika <xliff:g id="NAME_2">^1</xliff:g>."</b>" Kuepuka kupoteza data, hifadhi nakala rudufu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Futa data yote na upange upya"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Inapanga <xliff:g id="NAME">^1</xliff:g>..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Usiondoe <xliff:g id="NAME">^1</xliff:g> inapopanga."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hamishia data kwenye hifadhi mpya"</string>
-    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Unaweza kuhamishia picha zako, faili, na data ya programu kwenye <xliff:g id="NAME">^1</xliff:g> hii mpya. \n\nKuhamisha kunachukua takriban <xliff:g id="TIME">^2</xliff:g> na kutaacha nafasi ya <xliff:g id="SIZE">^3</xliff:g> kwenye hifadhi ya ndani. Baadhi ya programu zinaweza zisifanye kazi wakati hili linaendelea."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Unaweza kuhamishia picha zako, faili, na data ya programu kwenye <xliff:g id="NAME">^1</xliff:g> hii mpya. \n\nKuhamisha kunachukua takriban <xliff:g id="TIME">^2</xliff:g> na kutaacha nafasi ya <xliff:g id="SIZE">^3</xliff:g> kwenye hifadhi ya ndani. Baadhi ya programu huenda hazitafanya kazi uhamishaji unapoendelea."</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hamisha sasa"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Hamisha baadaye"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Hamisha data sasa"</string>
@@ -997,7 +997,7 @@
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Hamisha data..."</string>
     <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Wakati wa kuhamisha: \n•Usiondoe <xliff:g id="NAME">^1</xliff:g>. \n • Baadhi ya programu hazitafanya kazi kwa usahihi. \n •Weka kifaa kikae na chaji."</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> iko tayari"</string>
-    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> yako iko tayari kutumia na picha na maudhui mengine."</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> yako iko tayari kutumiwa na picha na maudhui mengine."</string>
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> yako mpya inafanya kazi. \n\nKuhamishia picha, faili na data ya programu kwenye kifaa hiki, nenda kwenye Mipangilio &gt; Hifadhi."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hamisha <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Kuhamisha <xliff:g id="APP">^1</xliff:g> na data yake kwenda <xliff:g id="NAME_0">^2</xliff:g> kutachukua dakika chache tu. Hutaweza kutumia programu hadi ukamilishe kuhamisha. \n\nUsiondoe <xliff:g id="NAME_1">^2</xliff:g> wakati wa kuhamisha."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9755944..61909bc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -972,7 +972,7 @@
     <string name="storage_format_failure" msgid="8343688274191391889">"Không thể định dạng <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"Đổi tên bộ nhớ"</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Sau khi định dạng, bạn có thể sử dụng <xliff:g id="NAME_0">^1</xliff:g> này trong các thiết bị khác. \n\nTất cả dữ liệu trên <xliff:g id="NAME_1">^1</xliff:g> này sẽ bị xóa. Trước tiên, hãy cân nhắc việc sao lưu. \n\n"<b>"Sao lưu ảnh và các phương tiện khác"</b>" \nDi chuyển tệp phương tiện sang bộ nhớ khác trên thiết bị này hoặc chuyển chúng sang máy tính bằng cáp USB. \n\n"<b>"Sao lưu ứng dụng"</b>" \nTất cả ứng dụng được lưu trữ trên <xliff:g id="NAME_6">^1</xliff:g> này sẽ bị gỡ cài đặt và dữ liệu ứng dụng sẽ bị xóa. Để lưu giữ các ứng dụng này, hãy di chuyển chúng sang bộ nhớ khác trên thiết bị này."</string>
-    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Khi bạn ngắt kết nối <xliff:g id="NAME_0">^1</xliff:g> này, các ứng dụng được lưu trữ trên đó sẽ ngừng hoạt động, đồng thời các tệp phương tiện được lưu trữ trên đó sẽ không khả dụng cho tới khi lắp lại."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> này được định dạng để chỉ hoạt động trên thiết bị này. Nó sẽ không hoạt động trên bất kỳ thiết bị nào khác."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Khi bạn tháo <xliff:g id="NAME_0">^1</xliff:g> này, các ứng dụng được lưu trữ trên đó sẽ ngừng hoạt động, đồng thời các tệp phương tiện được lưu trữ trên đó sẽ không khả dụng cho tới khi lắp lại."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> này được định dạng để chỉ hoạt động trên thiết bị này. Nó sẽ không hoạt động trên bất kỳ thiết bị nào khác."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Thiết lập <xliff:g id="NAME">^1</xliff:g> của bạn"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sử dụng làm bộ nhớ di động"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Để di chuyển ảnh và phương tiện khác giữa các thiết bị."</string>
@@ -2575,7 +2575,7 @@
       <item quantity="other">Đổi sang chỉ các thông báo ưu tiên trong <xliff:g id="DURATION">%1$d</xliff:g> giờ (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="one">Đổi sang chỉ các thông báo ưu tiên trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
     </plurals>
-    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Đổi sang chỉ báo thức vô không giới hạn"</string>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Đổi sang chỉ báo thức không giới hạn"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
       <item quantity="other">Đổi sang chỉ báo thức trong <xliff:g id="DURATION">%1$d</xliff:g> phút (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="one">Đổi sang chỉ báo thức trong một phút cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6a0a8f2..728f198 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -658,10 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"要登录以便连接到网络吗？"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g>要求您必须先在线登录热点，然后才能连接到网络。"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"连接"</string>
-    <!-- no translation found for no_internet_access_text (1509171132175355674) -->
-    <skip />
-    <!-- no translation found for no_internet_access_remember (5963015664551707981) -->
-    <skip />
+    <string name="no_internet_access_text" msgid="1509171132175355674">"使用此网络将无法访问互联网。仍要使用此网络吗？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"对于此网络不再询问"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index dd7382f..e9da7fe 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,8 +47,8 @@
     <color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color>
     <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
     <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
-    <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
-    <color name="setup_wizard_wifi_color_light">#ff0096a6</color>
+    <color name="setup_wizard_wifi_color_dark">#ff448aff</color>
+    <color name="setup_wizard_wifi_color_light">#ff3367d6</color>
 
     <color name="lock_pattern_background">#00000000</color>
     <color name="lock_pattern_view_regular_color">#ff37474f</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 153492b..5546cc4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1466,8 +1466,6 @@
     <string name="wifi_more">More</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Automatic setup (WPS)</string>
-    <!-- Message informing that wifi is required during setup [CHAR LIMIT=NONE] -->
-    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi\u2011Fi. After setup, you can switch between cellular data and Wi\u2011Fi.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
@@ -6131,19 +6129,19 @@
     <string name="zen_mode_option_voice_important_interruptions">Allow only priority interruptions</string>
 
     <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for important interriuptions -->
-    <string name="zen_mode_option_voice_important_synonyms">important,priority,priority notifications</string>
+    <string name="zen_mode_option_voice_important_synonyms">important,priority,priority only,only priority,priority notifications</string>
 
     <!-- [CHAR LIMIT=80] Zen mode voice option: Alarms only -->
     <string name="zen_mode_option_voice_alarms">Allow only alarms</string>
 
     <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for alarm interriuptions -->
-    <string name="zen_mode_option_voice_alarms_synonyms">alarms</string>
+    <string name="zen_mode_option_voice_alarms_synonyms">alarms,alarms only,only alarms</string>
 
-    <!-- [CHAR LIMIT=80] Zen mode voice: No interruptions [CHAR LIMIT=60] -->
+    <!-- [CHAR LIMIT=80] Zen mode voice: No interruptions -->
     <string name="zen_mode_option_voice_no_interruptions">Don\'t interrupt</string>
 
     <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for no interriuptions -->
-    <string name="zen_mode_option_voice_no_interruptions_synonyms">none,nothing,no interruptions</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms">none,never,nothing,no interruptions</string>
 
     <!-- [CHAR LIMIT=40] Zen mode voice: Label for indefinite mode duration -->
     <string name="zen_mode_duration_indefinte_voice_label">Indefinitely</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0d28126..2c900bb 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,7 +41,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
@@ -62,7 +62,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 68cfb60..1b32b86 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -146,7 +146,7 @@
             setHasOptionsMenu(true);
         }
 
-        mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);
+        mSubscriptionInfo = SubscriptionManager.from(activity).getActiveSubscriptionInfo(subId);
     }
 
     @Override
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 6e72ef7..27a486c 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -717,9 +717,9 @@
 
         int simCount = mTelephonyManager.getSimCount();
 
-        for (int i = 0; i < simCount; i++) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(context, i);
-            if (sir != null) {
+        List<SubscriptionInfo> sirs = mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (sirs != null) {
+            for (SubscriptionInfo sir : sirs) {
                 addMobileTab(context, sir, (simCount > 1));
             }
         }
@@ -880,8 +880,8 @@
         if (mCurrentTab != null && mCurrentTab.length() > TAB_MOBILE.length() ){
             final int slotId = Integer.parseInt(mCurrentTab.substring(TAB_MOBILE.length(),
                     mCurrentTab.length()));
-            final SubscriptionInfo sir = com.android.settings.Utils.findRecordBySlotId(context,
-                    slotId);
+            final SubscriptionInfo sir = mSubscriptionManager
+                    .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
             if (sir != null) {
                 seriesColor = sir.getIconTint();
@@ -1245,8 +1245,7 @@
             return;
         }
 
-        final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
-                mSubscriptionManager.getDefaultDataSubId());
+        final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
 
         // If the device is single SIM or is enabling data on the active data SIM then forgo
         // the pop-up.
@@ -2784,22 +2783,7 @@
             return -1;
         }
 
-        //SUB SELECT
-        private boolean isMobileDataAvailable(long subId) {
-            int[] subIds = SubscriptionManager.getSubId(PhoneConstants.SUB1);
-            if (subIds != null && subIds[0] == subId) {
-                return true;
-            }
-
-            subIds = SubscriptionManager.getSubId(PhoneConstants.SUB2);
-            if (subIds != null && subIds[0] == subId) {
-                return true;
-            }
-
-            subIds = SubscriptionManager.getSubId(PhoneConstants.SUB3);
-            if (subIds != null && subIds[0] == subId) {
-                return true;
-            }
-            return false;
+        private boolean isMobileDataAvailable(int subId) {
+            return mSubscriptionManager.getActiveSubscriptionInfo(subId) != null;
         }
 }
diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 8449a1f..c5ea7b4 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -31,7 +31,6 @@
 import android.os.CancellationSignal;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.os.Vibrator;
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
 import android.util.Log;
@@ -101,7 +100,6 @@
         private Stage mStage;
         private int mEnrollmentSteps;
         private boolean mEnrolling;
-        private Vibrator mVibrator;
         private ProgressBar mProgressBar;
         private ImageView mFingerprintAnimator;
         private ObjectAnimator mProgressAnim;
@@ -289,11 +287,6 @@
 
         private void updateProgress(int progress) {
             if (DEBUG) Log.v(TAG, "Progress: " + progress);
-            if (mVibrator != null) {
-                mVibrator.vibrate(100, new AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build());
-            }
             if (mProgressAnim != null) {
                 mProgressAnim.cancel();
             }
@@ -367,7 +360,6 @@
             final Activity activity = getActivity();
             mFingerprintManager = (FingerprintManager)activity
                     .getSystemService(Context.FINGERPRINT_SERVICE);
-            mVibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
             mPowerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
 
             mContentView = inflater.inflate(R.layout.fingerprint_enroll, null);
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 0e47afb..168d3c8 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -212,14 +212,15 @@
             mTabHost.setOnTabChangedListener(mTabListener);
             mTabHost.clearAllTabs();
 
+            SubscriptionManager sm = SubscriptionManager.from(this);
             for (int i = 0; i < numSims; ++i) {
-                final SubscriptionInfo subInfo = Utils.findRecordBySlotId(this, i);
+                final SubscriptionInfo subInfo = sm.getActiveSubscriptionInfoForSimSlotIndex(i);
                 mTabHost.addTab(buildTabSpec(String.valueOf(i),
                         String.valueOf(subInfo == null
                             ? context.getString(R.string.sim_editor_title, i + 1)
                             : subInfo.getDisplayName())));
             }
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), 0);
+            final SubscriptionInfo sir = sm.getActiveSubscriptionInfoForSimSlotIndex(0);
 
             mPhone = (sir == null) ? null
                 : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
@@ -476,7 +477,8 @@
         @Override
         public void onTabChanged(String tabId) {
             final int slotId = Integer.parseInt(tabId);
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), slotId);
+            final SubscriptionInfo sir = SubscriptionManager.from(getBaseContext())
+                    .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
             mPhone = (sir == null) ? null
                 : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index dc4b484..d05160c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1029,49 +1029,6 @@
     }
 
     /**
-     * finds a record with subId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    public static SubscriptionInfo findRecordBySubId(Context context, final int subId) {
-        final List<SubscriptionInfo> subInfoList =
-                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
-        if (subInfoList != null) {
-            final int subInfoLength = subInfoList.size();
-
-            for (int i = 0; i < subInfoLength; ++i) {
-                final SubscriptionInfo sir = subInfoList.get(i);
-                if (sir != null && sir.getSubscriptionId() == subId) {
-                    return sir;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * finds a record with slotId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) {
-        final List<SubscriptionInfo> subInfoList =
-                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
-        if (subInfoList != null) {
-            final int subInfoLength = subInfoList.size();
-
-            for (int i = 0; i < subInfoLength; ++i) {
-                final SubscriptionInfo sir = subInfoList.get(i);
-                if (sir.getSimSlotIndex() == slotId) {
-                    //Right now we take the first subscription on a SIM.
-                    return sir;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
      * Queries for the UserInfo of a user. Returns null if the user doesn't exist (was removed).
      * @param userManager Instance of UserManager
      * @param checkUser The user to check the existence of.
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index b675ba4..1502173 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -312,7 +312,9 @@
             mFilterAdapter.enableFilter(FILTER_APPS_PRIORITY);
             mFilterAdapter.enableFilter(FILTER_APPS_SENSITIVE);
         }
-        mApplications.setOverrideFilter(new VolumeFilter(mVolumeUuid));
+        if (mListType == LIST_TYPE_STORAGE) {
+            mApplications.setOverrideFilter(new VolumeFilter(mVolumeUuid));
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index c4f4bbb..d82e6c9 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -89,10 +89,8 @@
                     removePreferenceFromScreen(KEY_ICC_ID);
                 }
             } else {
-                setSummaryText(KEY_IMEI, phone.getDeviceId());
-                setSummaryText(KEY_IMEI_SV,
-                        ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
-                        .getDeviceSoftwareVersion(phoneId));
+                setSummaryText(KEY_IMEI, phone.getImei());
+                setSummaryText(KEY_IMEI_SV, phone.getDeviceSvn());
                 // device is not CDMA, do not display CDMA features
                 // check Null in case no specified preference in overlay xml
                 removePreferenceFromScreen(KEY_PRL_VERSION);
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index c52f385..4fa5673 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -132,9 +132,9 @@
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
 
-        mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
-        mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
+        mSelectableSubInfos = SubscriptionManager.from(this).getActiveSubscriptionInfoList();
 
         addPreferencesFromResource(R.xml.device_info_sim_status);
 
@@ -143,13 +143,6 @@
         // Note - missing in zaku build, be careful later...
         mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
 
-        for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(this, i);
-            if (sir != null) {
-                mSelectableSubInfos.add(sir);
-            }
-        }
-
         mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
         if (mSelectableSubInfos.size() > 1) {
             setContentView(R.layout.sim_information);
@@ -351,10 +344,8 @@
         }
         // If formattedNumber is null or empty, it'll display as "Unknown".
         setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
-        final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
-                ? mPhone.getImei() : mPhone.getDeviceId();
-        setSummaryText(KEY_IMEI, imei);
-        setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/));
+        setSummaryText(KEY_IMEI, mPhone.getImei());
+        setSummaryText(KEY_IMEI_SV, mPhone.getDeviceSvn());
 
         if (!mShowLatestAreaInfo) {
             removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index a78d06c..b86f9c6 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -72,7 +72,7 @@
     // Broadcasts to listen to for connectivity changes.
     private static final String[] CONNECTIVITY_INTENTS = {
             BluetoothAdapter.ACTION_STATE_CHANGED,
-            ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE,
+            ConnectivityManager.CONNECTIVITY_ACTION,
             WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,
             WifiManager.NETWORK_STATE_CHANGED_ACTION,
     };
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index db957a7..129c359 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -154,6 +154,9 @@
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 final boolean banned = (Boolean) newValue;
+                if (banned) {
+                    MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BAN_APP_NOTES, pkg);
+                }
                 final boolean success =  mBackend.setNotificationsBanned(pkg, uid, banned);
                 if (success) {
                     updateDependents(banned);
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 97762c4..03a9daf 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -80,7 +80,8 @@
     private void displayPreferredDialog(final int slotId) {
         final Resources res = getResources();
         final Context context = getApplicationContext();
-        final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);
+        final SubscriptionInfo sir = SubscriptionManager.from(context)
+                .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
         if (sir != null) {
             AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
@@ -214,7 +215,8 @@
                 list.add((String)phoneAccount.getLabel());
                 int subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount);
                 if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-                    final SubscriptionInfo sir = Utils.findRecordBySubId(context, subId);
+                    final SubscriptionInfo sir = SubscriptionManager.from(context)
+                            .getActiveSubscriptionInfo(subId);
                     callsSubInfoList.add(sir);
                 } else {
                     callsSubInfoList.add(null);
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 91dadbb..184e882 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -151,7 +151,10 @@
         mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         for (int i = 0; i < numSlots; ++i) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
+            // Less efficient than getActiveSubscriptionInfoList but we need to show a disable
+            // preference if the slot is empty
+            final SubscriptionInfo sir = mSubscriptionManager
+                    .getActiveSubscriptionInfoForSimSlotIndex(i);
             SimPreference simPreference = new SimPreference(getActivity(), sir, i);
             simPreference.setOrder(i-numSlots);
             mSimCards.addPreference(simPreference);
@@ -165,17 +168,7 @@
     }
 
     private void updateAvailableSubInfos(){
-        final TelephonyManager tm =
-            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-        final int numSlots = tm.getSimCount();
-
-        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
-        for (int i = 0; i < numSlots; ++i) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
-            mAvailableSubInfos.add(sir);
-            if (sir != null) {
-            }
-        }
+        mAvailableSubInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
     }
 
     private void updateAllOptions() {
@@ -203,8 +196,7 @@
 
     private void updateSmsValues() {
         final Preference simPref = findPreference(KEY_SMS);
-        final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(),
-                mSubscriptionManager.getDefaultSmsSubId());
+        final SubscriptionInfo sir = mSubscriptionManager.getDefaultSmsSubscriptionInfo();
         simPref.setTitle(R.string.sms_messages_title);
         if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList);
 
@@ -218,8 +210,7 @@
 
     private void updateCellularDataValues() {
         final Preference simPref = findPreference(KEY_CELLULAR_DATA);
-        final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(),
-                mSubscriptionManager.getDefaultDataSubId());
+        final SubscriptionInfo sir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
         simPref.setTitle(R.string.cellular_data_title);
         if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
 
@@ -396,14 +387,12 @@
                     mSubInfoRecord.setDisplayName(displayName);
                     mSubscriptionManager.setDisplayName(displayName, subId,
                             SubscriptionManager.NAME_SOURCE_USER_INPUT);
-                    Utils.findRecordBySubId(getActivity(), subId).setDisplayName(displayName);
 
                     final int tintSelected = tintSpinner.getSelectedItemPosition();
                     int subscriptionId = mSubInfoRecord.getSubscriptionId();
                     int tint = mTintArr[tintSelected];
                     mSubInfoRecord.setIconTint(tint);
                     mSubscriptionManager.setIconTint(tint, subscriptionId);
-                    Utils.findRecordBySubId(getActivity(), subscriptionId).setIconTint(tint);
 
                     updateAllOptions();
                     update();
diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java
index 21849a4..2553a54 100644
--- a/src/com/android/settings/utils/VoiceSettingsActivity.java
+++ b/src/com/android/settings/utils/VoiceSettingsActivity.java
@@ -21,11 +21,13 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.VoiceInteractor;
+import android.app.VoiceInteractor.AbortVoiceRequest;
 import android.app.VoiceInteractor.CompleteVoiceRequest;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.util.Log;
 
 /**
@@ -65,6 +67,10 @@
      * not null, then it will be read to the user.
      */
     protected void notifySuccess(CharSequence prompt) {
+        if (prompt != null) {
+            Toast.makeText(this, prompt, Toast.LENGTH_LONG).show();
+        }
+
         if (getVoiceInteractor() != null) {
             getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null));
         }
@@ -85,8 +91,14 @@
     /**
      * Indicates when the setting could not be changed.
      */
-    protected void notifyFailure(String reason) {
-        getVoiceInteractor().submitRequest(new VoiceInteractor.AbortVoiceRequest(reason, null));
+    protected void notifyFailure(CharSequence prompt) {
+        if (prompt != null) {
+            Toast.makeText(this, prompt, Toast.LENGTH_LONG).show();
+        }
+
+        if (getVoiceInteractor() != null) {
+            getVoiceInteractor().submitRequest(new AbortVoiceRequest(prompt, null));
+        }
     }
 
     protected void showFragment(Fragment fragment, String tag) {
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index 9862258..4dfea08 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -17,7 +17,6 @@
 package com.android.settings.wifi;
 
 import android.app.Dialog;
-import android.content.Intent;
 import android.net.wifi.WifiConfiguration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -42,9 +41,6 @@
 
     private static final String TAG = "WifiSettingsForSetupWizard";
 
-    // show a text regarding data charges when wifi connection is required during setup wizard
-    protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
-
     private View mAddOtherNetworkItem;
     private TextView mEmptyFooter;
     private boolean mListLastEmpty = false;
@@ -73,13 +69,6 @@
             }
         });
 
-        final Intent intent = getActivity().getIntent();
-        if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
-            final View requiredInfo =
-                    inflater.inflate(R.layout.setup_wifi_required_info, list, false);
-            list.addHeaderView(requiredInfo, null, false);
-        }
-
         return view;
     }